From 4a7b04152b1affa4a2c7f11133e3931613b06add Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 18 Aug 2023 13:30:42 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=87=BD=E6=95=B0=E5=A2=9E=E5=8A=A0=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E5=9F=BA=E6=95=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsuranceAccountDetailMapper.xml | 3 +- .../service/impl/SIAccountServiceImpl.java | 37 ++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 8a647fd2b..6535e2f0b 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -293,7 +293,8 @@ t.fund_per_json,t.fund_com_json,t.other_per_json, t.other_com_json,t.social_per_sum,t.social_com_sum, t.fund_per_sum,t.fund_com_sum,t.other_per_sum, - t.other_com_sum,t.per_sum,t.com_sum,t.payment_status + t.other_com_sum,t.per_sum,t.com_sum,t.payment_status, + t.social_payment_base_string,t.fund_payment_base_string,t.other_payment_base_string FROM hrsa_bill_detail t WHERE t.delete_type = 0 diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index ddf812e94..599f27b24 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -36,6 +36,7 @@ import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.siaccount.*; +import com.engine.salary.enums.sicategory.DataTypeEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.enums.sicategory.IsUseEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; @@ -871,7 +872,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (insuranceAccountBatchPO == null || Objects.equals(BillStatusEnum.NOT_ARCHIVED.getValue(), insuranceAccountBatchPO.getBillStatus())) { return Lists.newArrayList(); } -// List list = queryList(billMonth, taxAgentId, employeeIds); + //20230707增加福利核算明细中的缴纳状态+合计的数据项 List insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().queryList(billMonth, taxAgentId, employeeIds); //退差数据不参与薪资核算 @@ -941,6 +942,25 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { InsuranceAccountDetailPO commonSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.COMMON.getValue()); InsuranceAccountDetailPO repairSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.REPAIR.getValue()); InsuranceAccountDetailPO balanceSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.BALANCE.getValue()); + //取正常缴纳的福利基数信息 + if (StringUtils.isNotEmpty(commonSiAcct.getSocialPaymentBaseString())) { + Map socialBaseJson = JSON.parseObject(commonSiAcct.getSocialPaymentBaseString(), new HashMap().getClass()); + socialBaseJson.forEach((k, v) -> { + record.put(k + "socialBase", v); + }); + } + if (StringUtils.isNotEmpty(commonSiAcct.getFundPaymentBaseString())) { + Map fundBaseJson = JSON.parseObject(commonSiAcct.getFundPaymentBaseString(), new HashMap().getClass()); + fundBaseJson.forEach((k, v) -> { + record.put(k + "fundBase", v); + }); + } + if (StringUtils.isNotEmpty(commonSiAcct.getOtherPaymentBaseString())) { + Map otherBaseJson = JSON.parseObject(commonSiAcct.getOtherPaymentBaseString(), new HashMap().getClass()); + otherBaseJson.forEach((k, v) -> { + record.put(k + "otherBase", v); + }); + } //社保-正常缴纳 if (StringUtils.isNotEmpty(commonSiAcct.getSocialPerJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getSocialPerJson(), new HashMap().getClass()); @@ -1104,6 +1124,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Map commonResult = new LinkedHashMap<>(); Map repairResult = new LinkedHashMap<>(); Map balanceResult = new LinkedHashMap<>(); + Map baseResult = new LinkedHashMap<>(); result.put(SalaryI18nUtil.getI18nLabel(100393, "个人合计"), "perSum"); result.put(SalaryI18nUtil.getI18nLabel(100388, "社保个人合计"), "socialPerSum"); @@ -1126,23 +1147,33 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { Map categoryIdNameMap = getSICategoryService(user).categoryIdNameMap(); list.stream().forEach(item -> { if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), item.getId() + "socialBase"); + } result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "socialPer"); commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "socialCommonPer"); repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "socialRepairPer"); balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "socialBalancePer"); } if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), item.getId() + "fundBase"); + } result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "fundPer"); commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "fundCommonPer"); repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "fundRepairPer"); balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "fundBalancePer"); } if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { + if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "申报基数"), item.getId() + "otherBase"); + } result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(87159, "个人"), item.getId() + "otherPer"); commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "正常缴纳个人"), item.getId() + "otherCommonPer"); repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补缴个人"), item.getId() + "otherRepairPer"); balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(0, "补差个人"), item.getId() + "otherBalancePer"); } + }); result.put(SalaryI18nUtil.getI18nLabel(100397, "单位合计"), "comSum"); result.put(SalaryI18nUtil.getI18nLabel(100394, "社保单位合计"), "socialComSum"); @@ -1183,6 +1214,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } }); + result.putAll(baseResult); result.putAll(commonResult); result.putAll(repairResult); result.putAll(balanceResult); @@ -1250,6 +1282,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { for (InsuranceAccountDetailPO item : v) { encryptUtil.decrypt(item, InsuranceAccountDetailPO.class); insuranceAccountDetailPO.setId(item.getId()); + insuranceAccountDetailPO.setSocialPaymentBaseString(item.getSocialPaymentBaseString()); + insuranceAccountDetailPO.setFundPaymentBaseString(item.getFundPaymentBaseString()); + insuranceAccountDetailPO.setOtherPaymentBaseString(item.getOtherPaymentBaseString()); BigDecimal socialPerSum = StringUtils.isBlank(item.getSocialPerSum()) ? new BigDecimal("0") : new BigDecimal(item.getSocialPerSum()); BigDecimal socialComSum = StringUtils.isBlank(item.getSocialComSum()) ? new BigDecimal("0") : new BigDecimal(item.getSocialComSum()); BigDecimal fundPerSum = StringUtils.isBlank(item.getFundPerSum()) ? new BigDecimal("0") : new BigDecimal(item.getFundPerSum()); From 4ffca1872a821742e1bb839f935e4a9e4cf3ad36 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 18 Aug 2023 17:58:36 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8=E5=90=88=E8=AE=A1=E8=A1=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siexport/param/InsuranceExportParam.java | 18 +++++++++ .../service/impl/SIExportServiceImpl.java | 39 +++++++++++++++++-- .../engine/salary/util/excel/ExcelUtil.java | 1 + 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/siexport/param/InsuranceExportParam.java b/src/com/engine/salary/entity/siexport/param/InsuranceExportParam.java index d7cd4966d..ae4cfc61a 100644 --- a/src/com/engine/salary/entity/siexport/param/InsuranceExportParam.java +++ b/src/com/engine/salary/entity/siexport/param/InsuranceExportParam.java @@ -7,6 +7,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @Author weaver_cl @@ -27,4 +29,20 @@ public class InsuranceExportParam extends BaseQueryParam { private String paymentOrganization; private Long creator; + + private Integer paymentStatus; + + private List employeeIds; + + private String userName; + + + /** + * 退差月份 + */ + private List recessionMonthList; + + private List taxAgents; + + private String workcode; } diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index add71efbd..e66059a96 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -7,14 +7,13 @@ import com.engine.core.impl.Service; import com.engine.salary.biz.SIAccountBiz; import com.engine.salary.encrypt.EncryptUtil; import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO; +import com.engine.salary.entity.siaccount.param.InsuranceAccountDetailParam; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.siexport.param.InsuranceExportParam; import com.engine.salary.entity.siexport.po.AccountExportPO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.siaccount.BillStatusEnum; -import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.siaccount.PaymentStatusEnum; import com.engine.salary.enums.siaccount.ResourceFromEnum; import com.engine.salary.enums.sicategory.DataTypeEnum; @@ -24,10 +23,13 @@ import com.engine.salary.mapper.siaccount.InsuranceAccountDetailMapper; import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; +import com.engine.salary.service.SIAccountService; import com.engine.salary.service.SIExportService; import com.engine.salary.service.SISchemeService; import com.engine.salary.service.TaxAgentService; +import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.sys.entity.vo.OrderRuleVO; +import com.engine.salary.sys.enums.OpenEnum; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; import com.engine.salary.util.SalaryAssert; @@ -35,6 +37,7 @@ import com.engine.salary.util.SalaryEnumUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; +import org.springframework.beans.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -47,6 +50,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import static com.engine.salary.enums.UserStatusEnum.getDefaultLabelByValue; +import static com.engine.salary.sys.constant.SalarySysConstant.OPEN_ACCT_RESULT_SUM; /** * @Author weaver_cl @@ -94,6 +98,10 @@ public class SIExportServiceImpl extends Service implements SIExportService { return MapperProxyFactory.getProxy(ICategoryMapper.class); } + private SIAccountService getSIAccountService(User user) { + return ServiceUtil.getService(SIAccountServiceImpl.class, user); + } + @Override public XSSFWorkbook exportOverView(InsuranceExportParam queryParam) { List insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().selectList(queryParam.getBillMonth(), StringUtils.isBlank(queryParam.getPaymentOrganization()) ? null : Long.valueOf(queryParam.getPaymentOrganization())); @@ -158,8 +166,10 @@ public class SIExportServiceImpl extends Service implements SIExportService { if (CollectionUtils.isEmpty(taxAgents)) { //防止普通用户查询 accountExportPOS = new ArrayList<>(); + param = new InsuranceExportParam(); } else { accountExportPOS.stream().filter(f -> taxAgents.contains(f.getPaymentOrganization())).collect(Collectors.toList()); + param.setTaxAgents(taxAgents); } } } else { @@ -193,6 +203,28 @@ public class SIExportServiceImpl extends Service implements SIExportService { //工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(85368, "社保福利档案"); excelSheetData.add(Arrays.asList(columns.stream().map(WeaTableColumn::getText).toArray(String[]::new))); + //合计 + boolean total = false; + SalarySysConfPO openSum = getSalarySysConfService(user).getOneByCode(OPEN_ACCT_RESULT_SUM); + if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) { + total = true; + InsuranceAccountDetailParam queryParam = new InsuranceAccountDetailParam(); + BeanUtils.copyProperties(param, queryParam); + Map sumRow = new HashMap<>(); + if (paymentStatus.equals(PaymentStatusEnum.COMMON.getValue())) { + sumRow = getSIAccountService(user).listCommonSum(queryParam); + } else if (paymentStatus.equals(PaymentStatusEnum.REPAIR.getValue())) { + sumRow = getSIAccountService(user).listSupplementarySum(queryParam); + } else if (paymentStatus.equals(PaymentStatusEnum.RECESSION.getValue())) { + sumRow = getSIAccountService(user).listRecessionSum(queryParam); + } else if (paymentStatus.equals(PaymentStatusEnum.BALANCE.getValue())) { + sumRow = getSIAccountService(user).listBalanceSum(queryParam); + } + Map sumMap = (Map) sumRow.get("sumRow"); + sumMap.put("department", "总计"); + + records.add(sumMap); + } //工作簿数据 List> rows = new LinkedList<>(); for (Map recordData : records) { @@ -202,8 +234,9 @@ public class SIExportServiceImpl extends Service implements SIExportService { } rows.add(row); } + excelSheetData.addAll(rows); - return ExcelUtil.genWorkbookV2(excelSheetData, sheetName); + return ExcelUtil.genWorkbookV2(excelSheetData, sheetName, total); } diff --git a/src/com/engine/salary/util/excel/ExcelUtil.java b/src/com/engine/salary/util/excel/ExcelUtil.java index c733129fb..c50c11d2b 100644 --- a/src/com/engine/salary/util/excel/ExcelUtil.java +++ b/src/com/engine/salary/util/excel/ExcelUtil.java @@ -223,6 +223,7 @@ public class ExcelUtil { redFont.setFontName("宋体"); redFont.setFontHeightInPoints((short) 10);// 设置字体大小 redFont.setColor(new XSSFColor(new Color(0xFF3333), null)); + redFont.setBold(true); redCellStyle.setWrapText(true); redCellStyle.setFont(redFont);// 选择需要用到的字体格式 From 299284872f57003fffdf808e9aab96bcf77c3d20 Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 21 Aug 2023 14:58:01 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SISchemeBiz.java | 3 +- .../InsuranceSchemeDetailUpdateParam.java | 61 +++++++++++++++++ .../sischeme/InsuranceSchemeDetailMapper.java | 2 + .../sischeme/InsuranceSchemeDetailMapper.xml | 67 +++++++++++++++++++ .../salary/service/SISchemeService.java | 7 ++ .../service/impl/SISchemeServiceImpl.java | 52 ++++++++++++++ .../engine/salary/web/SISchemeController.java | 18 ++++- 7 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 src/com/engine/salary/entity/sischeme/param/InsuranceSchemeDetailUpdateParam.java diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index 2c0f21f65..74dba143c 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -252,7 +252,8 @@ public class SISchemeBiz { InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class); List insuranceSchemeDetailPOS = insuranceSchemeDetailMapper.queryListBySchemeId(primaryId); encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); - return decryptSchemeDetailList(insuranceSchemeDetailPOS); +// return decryptSchemeDetailList(insuranceSchemeDetailPOS); + return insuranceSchemeDetailPOS; } finally { sqlSession.close(); } diff --git a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeDetailUpdateParam.java b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeDetailUpdateParam.java new file mode 100644 index 000000000..1fc83a32f --- /dev/null +++ b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeDetailUpdateParam.java @@ -0,0 +1,61 @@ +package com.engine.salary.entity.sischeme.param; + +import com.engine.salary.entity.sischeme.dto.InsuranceSchemeDTO; +import com.engine.salary.entity.sischeme.dto.InsuranceSchemeDetailDTO; +import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + + +/** + * @Author sy + * @Description: 福利方案明细修改 + * @Date 2023/8/21 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InsuranceSchemeDetailUpdateParam { + + /** + * 社保方案主表id + */ + private Long primaryId; + + /** + * 险种id + */ + private Long insuranceId; + + /** + * 是否缴费 + */ + private Integer isPayment; + + + /** + * 缴纳对象枚举value 1-公司 2-个人 + */ + private Integer paymentScope; + + + /** + * 缴纳比例 + */ + private String paymentProportion; + + /** + * 固定费用 + */ + private String fixedCost; + + + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java index 3b15f7eea..5f7060f35 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java @@ -75,4 +75,6 @@ public interface InsuranceSchemeDetailMapper { List listAll(); int batchUpdate(@Param("collection") List insuranceSchemeDetailPos); + + int batchUpdateAll(@Param("collection") List insuranceSchemeDetailPos); } diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index fc81b31f1..3529f08c3 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -308,4 +308,71 @@ #{item.id} + + + update hrsa_scheme_detail + + + + + when id=#{item.id} then #{item.isPayment} + + + + + + + when id=#{item.id} then #{item.paymentScope} + + + + + + + when id=#{item.id} then #{item.paymentProportion} + + + + + + + when id=#{item.id} then #{item.updateTime} + + + + + + + when id=#{item.id} then #{item.upperLimit} + + + + + + + when id=#{item.id} then #{item.fixedCost} + + + + + + + when id=#{item.id} then #{item.lowerLimit} + + + + + + + when id=#{item.id} then #{item.deleteType} + + + + + where + id in + + #{item.id} + + \ No newline at end of file diff --git a/src/com/engine/salary/service/SISchemeService.java b/src/com/engine/salary/service/SISchemeService.java index ebcf73858..d7a691b63 100644 --- a/src/com/engine/salary/service/SISchemeService.java +++ b/src/com/engine/salary/service/SISchemeService.java @@ -5,6 +5,7 @@ import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.siarchives.param.SIArchiveImportActionParam; import com.engine.salary.entity.siarchives.po.InsuranceArchivesEmployeePO; import com.engine.salary.entity.sischeme.dto.InsuranceSchemeListDTO; +import com.engine.salary.entity.sischeme.param.InsuranceSchemeDetailUpdateParam; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.entity.sischeme.param.SISchemaImportParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; @@ -74,4 +75,10 @@ public interface SISchemeService { Map checkSIArchiveAdd(SIArchiveImportActionParam siArchiveImportActionParam); Map addSIArchive(SIArchiveImportActionParam siArchiveImportActionParam); + + /** + * 编辑方案明细表数据 + * @param schemeDetailList + */ + List updateSchemeDetail(List schemeDetailList); } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index dca7cd0d5..f31ad4646 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -18,6 +18,7 @@ import com.engine.salary.entity.siarchives.param.SIArchiveImportActionParam; import com.engine.salary.entity.siarchives.po.*; import com.engine.salary.entity.sicategory.po.ICategoryPO; import com.engine.salary.entity.sischeme.dto.InsuranceSchemeListDTO; +import com.engine.salary.entity.sischeme.param.InsuranceSchemeDetailUpdateParam; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.entity.sischeme.param.SISchemaImportParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; @@ -57,12 +58,14 @@ import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import dm.jdbc.util.IdGenerator; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.BeanUtils; import weaver.file.ImageFileManager; import weaver.hrm.User; @@ -79,6 +82,7 @@ import static com.engine.salary.util.excel.ExcelSupport.EXCEL_TYPE_XLSX; * @Date 2022/3/7 * @Version V1.0 **/ +@Slf4j public class SISchemeServiceImpl extends Service implements SISchemeService { private EncryptUtil encryptUtil = new EncryptUtil(); @@ -124,6 +128,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } private SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + private SISchemeBiz siSchemeBiz = new SISchemeBiz(); private SalaryEmployeeService getSalaryEmployeeService(User user) { return (SalaryEmployeeService) ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); @@ -1513,4 +1518,51 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } } + @Override + public List updateSchemeDetail(List schemeDetailList) { + List errorInfo = new ArrayList<>(); + if (schemeDetailList.size() > 0) { + log.info("待处理方明明细数量:{}", schemeDetailList.size()); + List toDealSchemeDetailList = schemeDetailList.stream().filter(f -> f.getPrimaryId() != null).collect(Collectors.toList()); + log.info("未设置方案id的方明明细无法处理，数量:{}", schemeDetailList.size() - toDealSchemeDetailList.size()); + + //按照方案id分组 + Map> schemeDetailMap = toDealSchemeDetailList + .stream().collect(Collectors.groupingBy(InsuranceSchemeDetailUpdateParam::getPrimaryId)); + + schemeDetailMap.forEach((k, v) -> { + updateSchemeDetailByPrimaryId(k, v, errorInfo); + }); + + } + return errorInfo; + } + + public List updateSchemeDetailByPrimaryId(Long primaryId, List schemeDetailList, List errorInfo) { + try { + Map schemeDetailUpdateMap = new HashMap<>(); + schemeDetailList.forEach(f -> { + schemeDetailUpdateMap.put(f.getInsuranceId() + "-" + f.getPaymentScope(), f); + }); + List schemeDetailPOS = siSchemeBiz.listByPrimaryId(primaryId); + //替换修改字段 + if (schemeDetailPOS.size() > 0) { + schemeDetailPOS.forEach(f -> { + if (schemeDetailUpdateMap.get(f.getInsuranceId() + "-" + f.getPaymentScope()) != null) { + InsuranceSchemeDetailUpdateParam schemeDetailUpdateParam = schemeDetailUpdateMap.get(f.getInsuranceId() + "-" + f.getPaymentScope()); + BeanUtils.copyProperties(schemeDetailUpdateParam, f); + } + }); + encryptUtil.encryptList(schemeDetailPOS, InsuranceSchemeDetailPO.class); + getInsuranceSchemeDetailMapper().batchUpdateAll(schemeDetailPOS); + + } else { + errorInfo.add("方案id:" + primaryId + "," + "表中不存在方案明细数据"); + } + } catch (Exception e) { + errorInfo.add("方案id:" + primaryId + "," + e.getMessage()); + } + return errorInfo; + } + } diff --git a/src/com/engine/salary/web/SISchemeController.java b/src/com/engine/salary/web/SISchemeController.java index a41f03415..d751b0acc 100644 --- a/src/com/engine/salary/web/SISchemeController.java +++ b/src/com/engine/salary/web/SISchemeController.java @@ -5,6 +5,7 @@ import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.siaccount.po.InsuranceAccountInspectPO; import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam; import com.engine.salary.entity.sischeme.dto.InsuranceSchemeListDTO; +import com.engine.salary.entity.sischeme.param.InsuranceSchemeDetailUpdateParam; import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.entity.sischeme.param.InsuranceSchemeReqParam; import com.engine.salary.entity.sischeme.param.SISchemaImportParam; @@ -113,7 +114,7 @@ public class SISchemeController { } /** - * 编辑 + * 编辑方案主表和明细表数据 * @param request * @param response * @param insuranceSchemeReqParam @@ -129,6 +130,21 @@ public class SISchemeController { return new ResponseResult< Map, Map>(user).run(getService(user)::update,map); } + /** + * 编辑方案明细表数据 + * @param request + * @param response + * @param schemeDetailList + * @return + */ + @POST + @Path("/updateSchemeDetail") + @Produces(MediaType.APPLICATION_JSON) + public String updateSchemeDetail(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody List schemeDetailList) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult< List , List>(user).run(getService(user)::updateSchemeDetail,schemeDetailList); + } + /** * 删除(接口中暂无) * @param request From 5f9fbde35aa6848d53345016bb5ad7b9f0463c1c Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 21 Aug 2023 16:48:17 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SISchemeServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index f31ad4646..16d7e6d59 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -1551,6 +1551,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (schemeDetailUpdateMap.get(f.getInsuranceId() + "-" + f.getPaymentScope()) != null) { InsuranceSchemeDetailUpdateParam schemeDetailUpdateParam = schemeDetailUpdateMap.get(f.getInsuranceId() + "-" + f.getPaymentScope()); BeanUtils.copyProperties(schemeDetailUpdateParam, f); + f.setUpdateTime(new Date()); } }); encryptUtil.encryptList(schemeDetailPOS, InsuranceSchemeDetailPO.class); From c94f1b24a41ef868a74a1bccd8a08110ca4c524a Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 22 Aug 2023 14:47:48 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88?= =?UTF-8?q?action=E3=80=81=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=88=E4=BB=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E5=80=BC=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/CheckEditSIArchiveAction.java | 136 +++++++++++++++++ .../salary/action/EditSIArchiveAction.java | 135 +++++++++++++++++ .../service/impl/SISchemeServiceImpl.java | 141 ++++++++++++++---- 3 files changed, 381 insertions(+), 31 deletions(-) create mode 100644 src/com/engine/salary/action/CheckEditSIArchiveAction.java create mode 100644 src/com/engine/salary/action/EditSIArchiveAction.java diff --git a/src/com/engine/salary/action/CheckEditSIArchiveAction.java b/src/com/engine/salary/action/CheckEditSIArchiveAction.java new file mode 100644 index 000000000..799237644 --- /dev/null +++ b/src/com/engine/salary/action/CheckEditSIArchiveAction.java @@ -0,0 +1,136 @@ +package com.engine.salary.action; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.siarchives.param.SIArchiveImportActionParam; +import com.engine.salary.service.SISchemeService; +import com.engine.salary.service.impl.SISchemeServiceImpl; +import com.engine.salary.util.SalaryEntityUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 编辑福利档案的前置校验 + * @Date: 2023/8/21 + **/ +@Slf4j +public class CheckEditSIArchiveAction implements Action { + + private SISchemeService getSISchemeService(User user) { + return ServiceUtil.getService(SISchemeServiceImpl.class,user); + } + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new CheckEditSIArchiveAction.SalaryField(processField, salaryName, value)); + } + List> importData = new ArrayList<>(); + importData.add(SalaryEntityUtil.convert2Map(list, CheckEditSIArchiveAction.SalaryField::getSalaryName, CheckEditSIArchiveAction.SalaryField::getValue)); + //福利执行状态 + String runStatus = list.stream().filter(f -> f.salaryName.equals("档案状态")).findFirst().map(CheckEditSIArchiveAction.SalaryField::getValue).orElse("1"); + + SIArchiveImportActionParam build = SIArchiveImportActionParam.builder() + .importDatas(importData) + .runStatus(runStatus) + .build(); + + //操作人 + String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(CheckEditSIArchiveAction.SalaryField::getValue).orElse("1"); + Map map = getSISchemeService(new User(Integer.parseInt(uid))).checkSIArchiveAdd(build); + + List errorNotice = (List) map.get("errorNotice"); + if (CollectionUtils.isNotEmpty(errorNotice)) { + log.error("福利档案编辑内容检查存在异常 requestId:{} ,参数:{}, map:{}", requestInfo.getRequestid(), build, map); + List> excelComments = (List>) map.get("errorNotice"); + StringBuilder message = new StringBuilder(""); + for (Map comments : excelComments) { + message.append(comments.get("message")).append("\n"); + } + requestInfo.getRequestManager().setMessage(message.toString()); + return FAILURE_AND_CONTINUE; + } + } catch (Exception e) { + log.error("福利档案编辑内容检查异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/action/EditSIArchiveAction.java b/src/com/engine/salary/action/EditSIArchiveAction.java new file mode 100644 index 000000000..6d9fc599c --- /dev/null +++ b/src/com/engine/salary/action/EditSIArchiveAction.java @@ -0,0 +1,135 @@ +package com.engine.salary.action; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.siarchives.param.SIArchiveImportActionParam; +import com.engine.salary.service.SISchemeService; +import com.engine.salary.service.impl.SISchemeServiceImpl; +import com.engine.salary.util.SalaryEntityUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 编辑福利档案 + * @Date: 2023/8/21 + **/ +@Slf4j +public class EditSIArchiveAction implements Action { + private SISchemeService getSISchemeService(User user) { + return ServiceUtil.getService(SISchemeServiceImpl.class,user); + } + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new EditSIArchiveAction.SalaryField(processField, salaryName, value)); + } + List> importData = new ArrayList<>(); + importData.add(SalaryEntityUtil.convert2Map(list, EditSIArchiveAction.SalaryField::getSalaryName, EditSIArchiveAction.SalaryField::getValue)); + //福利执行状态 + String runStatus = list.stream().filter(f -> f.salaryName.equals("档案状态")).findFirst().map(EditSIArchiveAction.SalaryField::getValue).orElse("1"); + + SIArchiveImportActionParam build = SIArchiveImportActionParam.builder() + .importDatas(importData) + .runStatus(runStatus) + .build(); + + //操作人 + String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(EditSIArchiveAction.SalaryField::getValue).orElse("1"); + Map map = getSISchemeService(new User(Integer.parseInt(uid))).addSIArchive(build); + + List errorNotice = (List) map.get("errorNotice"); + if (CollectionUtils.isNotEmpty(errorNotice)) { + log.error("福利档案编辑存在异常 requestId:{} ,参数:{}, map:{}", requestInfo.getRequestid(), build, map); + List> excelComments = (List>) map.get("errorNotice"); + StringBuilder message = new StringBuilder(""); + for (Map comments : excelComments) { + message.append(comments.get("message")).append("\n"); + } + requestInfo.getRequestManager().setMessage(message.toString()); + return FAILURE_AND_CONTINUE; + } + } catch (Exception e) { + log.error("福利档案编辑异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index dca7cd0d5..b1edd58c4 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -56,6 +56,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.mzlion.core.utils.BeanUtils; import dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -1093,28 +1094,50 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (employeeId == null) { return null; } + Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"))); + List oldSocialSchemeInfos = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO + .builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrg) + .build()); + InsuranceArchivesSocialSchemePO oldSocialSchemePO = new InsuranceArchivesSocialSchemePO(); InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO = new InsuranceArchivesSocialSchemePO(); + + //设置社保账号、起始缴纳月、最后缴纳月 + String socialAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91324, "社保账号")).get(SalaryI18nUtil.getI18nLabel(91324, "社保账号")); + Long socialSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")).get(SalaryI18nUtil.getI18nLabel(91323, "社保方案名称"))); + HashMap oldSocialBaseMap = new HashMap<>(); + if (oldSocialSchemeInfos.size() > 0) { + oldSocialSchemePO = oldSocialSchemeInfos.get(0); + encryptUtil.decrypt(oldSocialSchemePO, InsuranceArchivesSocialSchemePO.class); + BeanUtils.copyProperties(oldSocialSchemePO, insuranceArchivesSocialSchemePO); + //社保基数 + oldSocialBaseMap = JSON.parseObject(oldSocialSchemePO.getSocialPaymentBaseString(), new HashMap().getClass()); + } + insuranceArchivesSocialSchemePO.setId(IdGenerator.generate()); - insuranceArchivesSocialSchemePO.setSocialAccount((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91324, "社保账号")).get(SalaryI18nUtil.getI18nLabel(91324, "社保账号"))); - insuranceArchivesSocialSchemePO.setSocialSchemeId(schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")).get(SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")))); + if (StringUtils.isNotBlank(socialAccount)) { + insuranceArchivesSocialSchemePO.setSocialAccount(socialAccount); + } + if (socialSchemeId != null) { + insuranceArchivesSocialSchemePO.setSocialSchemeId(socialSchemeId); + } String socialStartDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91319, "社保起始缴纳月")).get(SalaryI18nUtil.getI18nLabel(91319, "社保起始缴纳月")); if (StringUtils.isNotBlank(socialStartDate) && socialStartDate.length() > 7) { socialStartDate = socialStartDate.substring(0, 7); - } else if (StringUtils.isBlank(socialStartDate)){ - socialStartDate = null; + insuranceArchivesSocialSchemePO.setSocialStartTime(socialStartDate); } - insuranceArchivesSocialSchemePO.setSocialStartTime(socialStartDate); + String socialEndDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91320, "社保最后缴纳月")).get(SalaryI18nUtil.getI18nLabel(91320, "社保最后缴纳月")); if (StringUtils.isNotBlank(socialEndDate) && socialEndDate.length() > 7) { socialEndDate = socialEndDate.substring(0, 7); - } else if (StringUtils.isBlank(socialEndDate)){ - socialEndDate = null; + insuranceArchivesSocialSchemePO.setSocialEndTime(socialEndDate); } - insuranceArchivesSocialSchemePO.setSocialEndTime(socialEndDate); + insuranceArchivesSocialSchemePO.setTenantKey(""); insuranceArchivesSocialSchemePO.setWelfareType(WelfareTypeEnum.SOCIAL_SECURITY.getValue()); insuranceArchivesSocialSchemePO.setUpdateTime(new Date()); - insuranceArchivesSocialSchemePO.setPaymentOrganization(paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")))); + insuranceArchivesSocialSchemePO.setPaymentOrganization(paymentOrg); insuranceArchivesSocialSchemePO.setNonPayment(NonPaymentEnum.YES.getValue()); insuranceArchivesSocialSchemePO.setCreator(creator); insuranceArchivesSocialSchemePO.setCreateTime(new Date()); @@ -1133,7 +1156,11 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } if (findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")) != null) { String itemValue = (String) findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")).get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - socialPaymentBase.put(String.valueOf(insuranceId), StringUtils.isBlank(itemValue) ? "0" : itemValue); + if (StringUtils.isNotBlank(itemValue)) { + socialPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldSocialBaseMap != null && StringUtils.isNotBlank(oldSocialBaseMap.get(String.valueOf(insuranceId)))) { + socialPaymentBase.put(String.valueOf(insuranceId), oldSocialBaseMap.get(String.valueOf(insuranceId))); + } } } insuranceArchivesSocialSchemePO.setSocialPaymentBaseString(JSON.toJSONString(socialPaymentBase)); @@ -1147,32 +1174,56 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (employeeId == null) { return null; } + Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"))); + List oldFundSchemeInfos = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO + .builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrg) + .build()); + InsuranceArchivesFundSchemePO oldFundSchemePO = new InsuranceArchivesFundSchemePO(); InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = new InsuranceArchivesFundSchemePO(); + + //设置公积金账号、起始缴纳月、最后缴纳月 + String fundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91486, "公积金账号")).get(SalaryI18nUtil.getI18nLabel(91486, "公积金账号")); + String supplementFundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")).get(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")); + Long fundSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")).get(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称"))); + HashMap oldFundBaseMap = new HashMap<>(); + if (oldFundSchemeInfos.size() > 0) { + oldFundSchemePO = oldFundSchemeInfos.get(0); + encryptUtil.decrypt(oldFundSchemePO, InsuranceArchivesFundSchemePO.class); + BeanUtils.copyProperties(oldFundSchemePO, insuranceArchivesFundSchemePO); + //社保基数 + oldFundBaseMap = JSON.parseObject(oldFundSchemePO.getFundPaymentBaseString(), new HashMap().getClass()); + } + insuranceArchivesFundSchemePO.setId(IdGenerator.generate()); insuranceArchivesFundSchemePO.setCreator(creator); insuranceArchivesFundSchemePO.setTenantKey(""); insuranceArchivesFundSchemePO.setCreateTime(new Date()); insuranceArchivesFundSchemePO.setUpdateTime(new Date()); - insuranceArchivesFundSchemePO.setFundSchemeId(schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")).get(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")))); - insuranceArchivesFundSchemePO.setFundAccount((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91486, "公积金账号")).get(SalaryI18nUtil.getI18nLabel(91486, "公积金账号"))); - insuranceArchivesFundSchemePO.setSupplementFundAccount((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")).get(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号"))); + if (fundSchemeId != null) { + insuranceArchivesFundSchemePO.setFundSchemeId(fundSchemeId); + } + if (StringUtils.isNotBlank(fundAccount)) { + insuranceArchivesFundSchemePO.setFundAccount(fundAccount); + } + if (StringUtils.isNotBlank(supplementFundAccount)) { + insuranceArchivesFundSchemePO.setSupplementFundAccount(supplementFundAccount); + } String fundStartDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91483, "公积金起始缴纳月")).get(SalaryI18nUtil.getI18nLabel(91483, "公积金起始缴纳月")); if (StringUtils.isNotBlank(fundStartDate) && fundStartDate.length() > 7) { fundStartDate = fundStartDate.substring(0, 7); - } else if (StringUtils.isBlank(fundStartDate)){ - fundStartDate = null; + insuranceArchivesFundSchemePO.setFundStartTime(fundStartDate); } - insuranceArchivesFundSchemePO.setFundStartTime(fundStartDate); String fundEndDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91484, "公积金最后缴纳月")).get(SalaryI18nUtil.getI18nLabel(91484, "公积金最后缴纳月")); if (StringUtils.isNotBlank(fundEndDate) && fundEndDate.length() > 7) { fundEndDate = fundEndDate.substring(0, 7); - } else if (StringUtils.isBlank(fundEndDate)){ - fundEndDate = null; + insuranceArchivesFundSchemePO.setFundEndTime(fundEndDate); } - insuranceArchivesFundSchemePO.setFundEndTime(fundEndDate); + insuranceArchivesFundSchemePO.setWelfareType(WelfareTypeEnum.ACCUMULATION_FUND.getValue()); - insuranceArchivesFundSchemePO.setPaymentOrganization(paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91488, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91488, "个税扣缴义务人")))); + insuranceArchivesFundSchemePO.setPaymentOrganization(paymentOrg); insuranceArchivesFundSchemePO.setNonPayment(NonPaymentEnum.YES.getValue()); insuranceArchivesFundSchemePO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); insuranceArchivesFundSchemePO.setUnderTake(UndertakerEnum.SCOPE_PERSON.getValue()); @@ -1189,7 +1240,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } if (findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")) != null) { String itemValue = (String) findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")).get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - socialPaymentBase.put(String.valueOf(insuranceId), StringUtils.isBlank(itemValue) ? "0" : itemValue); + if (StringUtils.isNotBlank(itemValue)) { + socialPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldFundBaseMap != null && StringUtils.isNotBlank(oldFundBaseMap.get(String.valueOf(insuranceId)))) { + socialPaymentBase.put(String.valueOf(insuranceId), oldFundBaseMap.get(String.valueOf(insuranceId))); + } + } } insuranceArchivesFundSchemePO.setFundPaymentBaseString(JSON.toJSONString(socialPaymentBase)); @@ -1202,29 +1258,47 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (employeeId == null) { return null; - } + }Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"))); + List oldOtherSchemeInfos = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO + .builder() + .employeeId(employeeId) + .paymentOrganization(paymentOrg) + .build()); + InsuranceArchivesOtherSchemePO oldOtherSchemePO = new InsuranceArchivesOtherSchemePO(); InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = new InsuranceArchivesOtherSchemePO(); + + //设置其他福利方案、起始缴纳月、最后缴纳月 + Long otherSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")).get(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"))); + HashMap oldOtherBaseMap = new HashMap<>(); + if (oldOtherSchemeInfos.size() > 0) { + oldOtherSchemePO = oldOtherSchemeInfos.get(0); + encryptUtil.decrypt(oldOtherSchemePO, InsuranceArchivesOtherSchemePO.class); + BeanUtils.copyProperties(oldOtherSchemePO, insuranceArchivesOtherSchemePO); + //社保基数 + oldOtherBaseMap = JSON.parseObject(oldOtherSchemePO.getOtherPaymentBaseString(), new HashMap().getClass()); + } + insuranceArchivesOtherSchemePO.setId(IdGenerator.generate()); insuranceArchivesOtherSchemePO.setCreator(creator); insuranceArchivesOtherSchemePO.setTenantKey(""); insuranceArchivesOtherSchemePO.setCreateTime(new Date()); insuranceArchivesOtherSchemePO.setUpdateTime(new Date()); - insuranceArchivesOtherSchemePO.setOtherSchemeId(schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")).get(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")))); + if (otherSchemeId != null) { + insuranceArchivesOtherSchemePO.setOtherSchemeId(otherSchemeId); + } String otherStartDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91490, "其他福利起始缴纳月")).get(SalaryI18nUtil.getI18nLabel(91490, "其他福利起始缴纳月")); if (StringUtils.isNotBlank(otherStartDate) && otherStartDate.length() > 7) { otherStartDate = otherStartDate.substring(0, 7); - } else if (StringUtils.isBlank(otherStartDate)){ - otherStartDate = null; + insuranceArchivesOtherSchemePO.setOtherStartTime(otherStartDate); } - insuranceArchivesOtherSchemePO.setOtherStartTime(otherStartDate); + String otherEndDate = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91494, "其他福利最后缴纳月")).get(SalaryI18nUtil.getI18nLabel(91494, "其他福利最后缴纳月")); if (StringUtils.isNotBlank(otherEndDate) && otherEndDate.length() > 7) { otherEndDate = otherEndDate.substring(0, 7); - } else if (StringUtils.isBlank(otherEndDate)){ - otherEndDate = null; + insuranceArchivesOtherSchemePO.setOtherEndTime(otherEndDate); } - insuranceArchivesOtherSchemePO.setOtherEndTime(otherEndDate); - insuranceArchivesOtherSchemePO.setPaymentOrganization(paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91497, "个税扣缴义务人")))); + + insuranceArchivesOtherSchemePO.setPaymentOrganization(paymentOrg); insuranceArchivesOtherSchemePO.setWelfareType(WelfareTypeEnum.OTHER.getValue()); insuranceArchivesOtherSchemePO.setNonPayment(NonPaymentEnum.YES.getValue()); insuranceArchivesOtherSchemePO.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue()); @@ -1241,7 +1315,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } if (findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")) != null) { String itemValue = (String) findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")).get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(100293, "申报基数")); - socialPaymentBase.put(String.valueOf(insuranceId), StringUtils.isBlank(itemValue) ? "0" : itemValue); + if (StringUtils.isNotBlank(itemValue)) { + socialPaymentBase.put(String.valueOf(insuranceId), itemValue); + } else if (oldOtherBaseMap != null && StringUtils.isNotBlank(oldOtherBaseMap.get(String.valueOf(insuranceId)))) { + socialPaymentBase.put(String.valueOf(insuranceId), oldOtherBaseMap.get(String.valueOf(insuranceId))); + } + } } insuranceArchivesOtherSchemePO.setOtherPaymentBaseString(JSON.toJSONString(socialPaymentBase)); From 2048e9c48940576c39d9c2a179bfbdda1d652342 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 23 Aug 2023 16:52:32 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E5=87=8F=E5=91=98=E3=80=81=E5=A2=9E=E5=91=98?= =?UTF-8?q?action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/CheckEditSIArchiveAction.java | 4 +- .../CheckStayAddToPaySIArchiveAction.java | 143 ++++++++++++++++ .../CheckStayDelToStopSIArchiveAction.java | 143 ++++++++++++++++ .../salary/action/EditSIArchiveAction.java | 4 +- .../action/StayAddToPaySIArchiveAction.java | 154 ++++++++++++++++++ .../action/StayDelToStopSIArchiveAction.java | 153 +++++++++++++++++ 6 files changed, 597 insertions(+), 4 deletions(-) create mode 100644 src/com/engine/salary/action/CheckStayAddToPaySIArchiveAction.java create mode 100644 src/com/engine/salary/action/CheckStayDelToStopSIArchiveAction.java create mode 100644 src/com/engine/salary/action/StayAddToPaySIArchiveAction.java create mode 100644 src/com/engine/salary/action/StayDelToStopSIArchiveAction.java diff --git a/src/com/engine/salary/action/CheckEditSIArchiveAction.java b/src/com/engine/salary/action/CheckEditSIArchiveAction.java index 799237644..936a1b697 100644 --- a/src/com/engine/salary/action/CheckEditSIArchiveAction.java +++ b/src/com/engine/salary/action/CheckEditSIArchiveAction.java @@ -75,10 +75,10 @@ public class CheckEditSIArchiveAction implements Action { String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(CheckEditSIArchiveAction.SalaryField::getValue).orElse("1"); Map map = getSISchemeService(new User(Integer.parseInt(uid))).checkSIArchiveAdd(build); - List errorNotice = (List) map.get("errorNotice"); + List errorNotice = (List) map.get("errorData"); if (CollectionUtils.isNotEmpty(errorNotice)) { log.error("福利档案编辑内容检查存在异常 requestId:{} ,参数:{}, map:{}", requestInfo.getRequestid(), build, map); - List> excelComments = (List>) map.get("errorNotice"); + List> excelComments = (List>) map.get("errorData"); StringBuilder message = new StringBuilder(""); for (Map comments : excelComments) { message.append(comments.get("message")).append("\n"); diff --git a/src/com/engine/salary/action/CheckStayAddToPaySIArchiveAction.java b/src/com/engine/salary/action/CheckStayAddToPaySIArchiveAction.java new file mode 100644 index 000000000..786d4c863 --- /dev/null +++ b/src/com/engine/salary/action/CheckStayAddToPaySIArchiveAction.java @@ -0,0 +1,143 @@ +package com.engine.salary.action; + +import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.siaccount.EmployeeStatusEnum; +import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 福利档案增员action的前置校验 + * @Date: 2023/8/22 + **/ +@Slf4j +public class CheckStayAddToPaySIArchiveAction implements Action { + + private InsuranceBaseInfoMapper getInsuranceBaseInfoMapper() { + return MapperProxyFactory.getProxy(InsuranceBaseInfoMapper.class); + } + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new CheckStayAddToPaySIArchiveAction.SalaryField(processField, salaryName, value)); + } + // 流程数据 + Map importDataMap = SalaryEntityUtil.convert2Map(list, CheckStayAddToPaySIArchiveAction.SalaryField::getSalaryName, CheckStayAddToPaySIArchiveAction.SalaryField::getValue); + String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString(); + List taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName); + if(CollectionUtils.isEmpty(taxAgentPOS)){ + requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！"); + return FAILURE_AND_CONTINUE; + } + Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); + Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); + + //操作人 + String uid = importDataMap.getOrDefault("操作人","1").toString(); + User user = new User(Integer.parseInt(uid)); + // 获取福利档案 + InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(taxAgentId, employeeId); + if(insuranceArchivesBaseInfoPO == null){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在福利档案，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } else if(!insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工的福利档案状态不是待增员，无法进行增员操作，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } + + } catch (Exception e) { + log.error("增员校验异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/action/CheckStayDelToStopSIArchiveAction.java b/src/com/engine/salary/action/CheckStayDelToStopSIArchiveAction.java new file mode 100644 index 000000000..a89df0ad4 --- /dev/null +++ b/src/com/engine/salary/action/CheckStayDelToStopSIArchiveAction.java @@ -0,0 +1,143 @@ +package com.engine.salary.action; + +import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.siaccount.EmployeeStatusEnum; +import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 福利档案减员action的前置校验 + * @Date: 2023/8/22 + **/ +@Slf4j +public class CheckStayDelToStopSIArchiveAction implements Action { + + private InsuranceBaseInfoMapper getInsuranceBaseInfoMapper() { + return MapperProxyFactory.getProxy(InsuranceBaseInfoMapper.class); + } + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new CheckStayDelToStopSIArchiveAction.SalaryField(processField, salaryName, value)); + } + // 流程数据 + Map importDataMap = SalaryEntityUtil.convert2Map(list, CheckStayDelToStopSIArchiveAction.SalaryField::getSalaryName, CheckStayDelToStopSIArchiveAction.SalaryField::getValue); + String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString(); + List taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName); + if(CollectionUtils.isEmpty(taxAgentPOS)){ + requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！"); + return FAILURE_AND_CONTINUE; + } + Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); + Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); + + //操作人 + String uid = importDataMap.getOrDefault("操作人","1").toString(); + User user = new User(Integer.parseInt(uid)); + // 获取福利档案 + InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(taxAgentId, employeeId); + if(insuranceArchivesBaseInfoPO == null){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在福利档案，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } else if(!insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工的福利档案状态不是待减员，无法进行减员操作，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } + + } catch (Exception e) { + log.error("减员校验异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/action/EditSIArchiveAction.java b/src/com/engine/salary/action/EditSIArchiveAction.java index 6d9fc599c..1fb188ed1 100644 --- a/src/com/engine/salary/action/EditSIArchiveAction.java +++ b/src/com/engine/salary/action/EditSIArchiveAction.java @@ -74,10 +74,10 @@ public class EditSIArchiveAction implements Action { String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(EditSIArchiveAction.SalaryField::getValue).orElse("1"); Map map = getSISchemeService(new User(Integer.parseInt(uid))).addSIArchive(build); - List errorNotice = (List) map.get("errorNotice"); + List errorNotice = (List) map.get("errorData"); if (CollectionUtils.isNotEmpty(errorNotice)) { log.error("福利档案编辑存在异常 requestId:{} ,参数:{}, map:{}", requestInfo.getRequestid(), build, map); - List> excelComments = (List>) map.get("errorNotice"); + List> excelComments = (List>) map.get("errorData"); StringBuilder message = new StringBuilder(""); for (Map comments : excelComments) { message.append(comments.get("message")).append("\n"); diff --git a/src/com/engine/salary/action/StayAddToPaySIArchiveAction.java b/src/com/engine/salary/action/StayAddToPaySIArchiveAction.java new file mode 100644 index 000000000..7f55d7d8a --- /dev/null +++ b/src/com/engine/salary/action/StayAddToPaySIArchiveAction.java @@ -0,0 +1,154 @@ +package com.engine.salary.action; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.siaccount.EmployeeStatusEnum; +import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; +import com.engine.salary.service.SIArchivesService; +import com.engine.salary.service.impl.SIArchivesServiceImpl; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 福利档案增员action + * @Date: 2023/8/22 + **/ +@Slf4j +public class StayAddToPaySIArchiveAction implements Action { + + private InsuranceBaseInfoMapper getInsuranceBaseInfoMapper() { + return MapperProxyFactory.getProxy(InsuranceBaseInfoMapper.class); + } + + private SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class,user); + } + + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new StayAddToPaySIArchiveAction.SalaryField(processField, salaryName, value)); + } + // 流程数据 + Map importDataMap = SalaryEntityUtil.convert2Map(list, StayAddToPaySIArchiveAction.SalaryField::getSalaryName, StayAddToPaySIArchiveAction.SalaryField::getValue); + String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString(); + List taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName); + if(CollectionUtils.isEmpty(taxAgentPOS)){ + requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！"); + return FAILURE_AND_CONTINUE; + } + Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); + Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); + + //操作人 + String uid = importDataMap.getOrDefault("操作人","1").toString(); + User user = new User(Integer.parseInt(uid)); + // 获取福利档案基础信息 + InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(taxAgentId, employeeId); + if(insuranceArchivesBaseInfoPO == null){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在福利档案，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } else if(!insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue())){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工的福利档案状态不是待增员，无法进行增员操作，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } + //增员 + Map resultMap = getSIArchivesService(user).stayAddToPay(Collections.singletonList(insuranceArchivesBaseInfoPO.getId())); + if (resultMap.get("type").toString().equals("fail")) { + requestInfo.getRequestManager().setMessage(resultMap.get("msg").toString()); + return FAILURE_AND_CONTINUE; + } + + } catch (Exception e) { + log.error("增员异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java b/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java new file mode 100644 index 000000000..c7aa0a8bf --- /dev/null +++ b/src/com/engine/salary/action/StayDelToStopSIArchiveAction.java @@ -0,0 +1,153 @@ +package com.engine.salary.action; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.siaccount.EmployeeStatusEnum; +import com.engine.salary.mapper.siarchives.InsuranceBaseInfoMapper; +import com.engine.salary.mapper.taxagent.TaxAgentMapper; +import com.engine.salary.service.SIArchivesService; +import com.engine.salary.service.impl.SIArchivesServiceImpl; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.Property; +import weaver.soa.workflow.request.RequestInfo; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 福利档案减员action + * @Date: 2023/8/22 + **/ +@Slf4j +public class StayDelToStopSIArchiveAction implements Action { + + private InsuranceBaseInfoMapper getInsuranceBaseInfoMapper() { + return MapperProxyFactory.getProxy(InsuranceBaseInfoMapper.class); + } + + private SIArchivesService getSIArchivesService(User user) { + return ServiceUtil.getService(SIArchivesServiceImpl.class,user); + } + + private TaxAgentMapper getTaxAgentMapper() { + return MapperProxyFactory.getProxy(TaxAgentMapper.class); + } + + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + + Property[] properties = requestInfo.getMainTableInfo().getProperty(); + Map fieldMap = Arrays.stream(properties).collect(Collectors.toMap(Property::getName, + property -> Util.null2String(property.getValue()))); + + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = fieldMap.get(processField); + list.add(new StayDelToStopSIArchiveAction.SalaryField(processField, salaryName, value)); + } + // 流程数据 + Map importDataMap = SalaryEntityUtil.convert2Map(list, StayDelToStopSIArchiveAction.SalaryField::getSalaryName, StayDelToStopSIArchiveAction.SalaryField::getValue); + String taxAgentName = importDataMap.getOrDefault("个税扣缴义务人", "").toString(); + List taxAgentPOS = getTaxAgentMapper().listByName(taxAgentName); + if(CollectionUtils.isEmpty(taxAgentPOS)){ + requestInfo.getRequestManager().setMessage("个税扣缴义务人不存在！"); + return FAILURE_AND_CONTINUE; + } + Long taxAgentId = Long.valueOf( taxAgentPOS.get(0).getId() ); + Long employeeId = Long.valueOf(importDataMap.getOrDefault("员工id", "-1").toString()); + + //操作人 + String uid = importDataMap.getOrDefault("操作人","1").toString(); + User user = new User(Integer.parseInt(uid)); + // 获取福利档案 + InsuranceArchivesBaseInfoPO insuranceArchivesBaseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(taxAgentId, employeeId); + if(insuranceArchivesBaseInfoPO == null){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工不存在福利档案，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } else if(!insuranceArchivesBaseInfoPO.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue())){ + requestInfo.getRequestManager().setMessage("该个税扣缴义务人下该员工的福利档案状态不是待减员，无法进行减员操作，请检查后重试！"); + return FAILURE_AND_CONTINUE; + } + //减员 + Map resultMap = getSIArchivesService(user).stayDelToStop(Collections.singletonList(insuranceArchivesBaseInfoPO.getId())); + if (resultMap.get("type").toString().equals("fail")) { + requestInfo.getRequestManager().setMessage(resultMap.get("msg").toString()); + return FAILURE_AND_CONTINUE; + } + + } catch (Exception e) { + log.error("减员异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} From 770074ba23a1d2f52ad4f7f91abbb4d99177045f Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 23 Aug 2023 17:48:52 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E9=9D=9E=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/SalaryAcctEmployeeMapper.xml | 212 ++++++++++++++++++ 1 file changed, 212 insertions(+) diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index d48bd3629..fcc53a473 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -576,6 +576,78 @@ AND em.status in (6) + + union all + + SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7) + + AND extem.username LIKE CONCAT('%',#{param.employeeName},'%') + + + AND extem.workcode like CONCAT('%',#{param.workcode},'%') + + -- 分部 + + AND extem.subcompany_id IN + + #{subcompanyId} + + + -- 部门 + + AND extem.department_id IN + + #{departmentId} + + + + AND extem.jobtitle_id IN + + #{positionId} + + + + AND extem.status IN + + #{userStatus} + + + -- 在职 + + AND extem.status in (0,1,2,3) + + -- 离职(解雇，离职，退休) + + AND extem.status in (4,5,6) + + -- 试用 + + AND extem.status in (0) + + -- 正式 + + AND extem.status in (1) + + -- 临时 + + AND extem.status in (2) + + -- 试用延期 + + AND extem.status in (3) + + -- 解雇 + + AND extem.status in (4) + + -- 离职 + + AND extem.status in (5) + + -- 退休 + + AND extem.status in (6) + ) @@ -666,6 +738,76 @@ AND em.status in (6) + + union all + + SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7) + + AND extem.username LIKE '%'||#{param.employeeName}||'%' + + + AND extem.workcode like '%'||#{param.workcode}||'%' + + + AND extem.subcompany_id IN + + #{subcompanyId} + + + + AND extem.department_id IN + + #{departmentId} + + + + AND extem.jobtitle_id IN + + #{positionId} + + + + AND extem.status IN + + #{userStatus} + + + -- 在职 + + AND extem.status in (0,1,2,3) + + -- 离职(解雇，离职，退休) + + AND extem.status in (4,5,6) + + -- 试用 + + AND extem.status in (0) + + -- 正式 + + AND extem.status in (1) + + -- 临时 + + AND extem.status in (2) + + -- 试用延期 + + AND extem.status in (3) + + -- 解雇 + + AND extem.status in (4) + + -- 离职 + + AND extem.status in (5) + + -- 退休 + + AND extem.status in (6) + ) @@ -758,6 +900,76 @@ AND em.status in (6) + union all + + SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7) + + AND extem.username LIKE '%'+#{param.employeeName}+'%' + + + AND extem.workcode like '%'+#{param.workcode}+'%' + + + AND extem.subcompany_id IN + + #{subcompanyId} + + + + AND extem.department_id IN + + #{departmentId} + + + + AND extem.jobtitle_id IN + + #{positionId} + + + + AND extem.status IN + + #{userStatus} + + + -- 在职 + + AND extem.status in (0,1,2,3) + + + -- 离职(解雇，离职，退休) + + AND extem.status in (4,5,6) + + -- 试用 + + AND extem.status in (0) + + -- 正式 + + AND extem.status in (1) + + -- 临时 + + AND extem.status in (2) + + -- 试用延期 + + AND extem.status in (3) + + -- 解雇 + + AND extem.status in (4) + + -- 离职 + + AND extem.status in (5) + + -- 退休 + + AND extem.status in (6) + ) From a3b67ab0916111ba5cc3c1595c98e73109c3b952 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 23 Aug 2023 18:39:02 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E7=BB=86sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sischeme/InsuranceSchemeDetailMapper.java | 2 +- .../sischeme/InsuranceSchemeDetailMapper.xml | 92 ++++++------------- .../service/impl/SISchemeServiceImpl.java | 2 +- 3 files changed, 30 insertions(+), 66 deletions(-) diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java index 5f7060f35..52c98c89d 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.java @@ -76,5 +76,5 @@ public interface InsuranceSchemeDetailMapper { int batchUpdate(@Param("collection") List insuranceSchemeDetailPos); - int batchUpdateAll(@Param("collection") List insuranceSchemeDetailPos); + int updateAll(InsuranceSchemeDetailPO insuranceSchemeDetailPo); } diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index 3529f08c3..132fd1c49 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -309,70 +309,34 @@ - + update hrsa_scheme_detail - - - - - when id=#{item.id} then #{item.isPayment} - - - - - - - when id=#{item.id} then #{item.paymentScope} - - - - - - - when id=#{item.id} then #{item.paymentProportion} - - - - - - - when id=#{item.id} then #{item.updateTime} - - - - - - - when id=#{item.id} then #{item.upperLimit} - - - - - - - when id=#{item.id} then #{item.fixedCost} - - - - - - - when id=#{item.id} then #{item.lowerLimit} - - - - - - - when id=#{item.id} then #{item.deleteType} - - - - - where - id in - - #{item.id} - + + + payment_scope=#{paymentScope}, + + + is_payment=#{isPayment}, + + + delete_type=#{deleteType}, + + + payment_proportion=#{paymentProportion}, + + + upper_limit=#{upperLimit}, + + + lower_limit=#{lowerLimit}, + + + update_time=#{updateTime}, + + + fixed_cost=#{fixedCost}, + + + WHERE id = #{id} AND delete_type = 0 \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 16d7e6d59..159b7a6a8 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -1555,7 +1555,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { } }); encryptUtil.encryptList(schemeDetailPOS, InsuranceSchemeDetailPO.class); - getInsuranceSchemeDetailMapper().batchUpdateAll(schemeDetailPOS); + schemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::updateAll); } else { errorInfo.add("方案id:" + primaryId + "," + "表中不存在方案明细数据"); From d94ee07de609d337d63f232aaefabaa587a25998 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 24 Aug 2023 09:17:39 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SISchemeServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 20fd2312a..a29848e61 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -57,7 +57,6 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.mzlion.core.utils.BeanUtils; import dm.jdbc.util.IdGenerator; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; From e83db15bc786503bbac7256fae18c7c253be1fe5 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 25 Aug 2023 15:09:12 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E3=80=81=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8E=A7=E5=88=B6=E4=BF=9D=E7=95=99=E4=BD=8D?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java | 1 + .../entity/salaryacct/dto/SalaryAcctResultDetailDTO.java | 3 +++ src/com/engine/salary/wrapper/SalaryArchiveWrapper.java | 1 + 3 files changed, 5 insertions(+) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index 259f213e5..73558cd0b 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -510,6 +510,7 @@ public class SalaryAcctResultBO { .itemFormulaContent(itemFormulaContent) // .canEdit(Objects.equals(Optional.ofNullable(salaryItemPO).map(SalaryItemPO::getUseInEmployeeSalary).orElse(0), 0)) .canEdit(true) + .pattern(salarySobItemPO.getPattern()) .build(); } diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java index 1df7b8a14..1929494a9 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultDetailDTO.java @@ -68,6 +68,9 @@ public class SalaryAcctResultDetailDTO { //是否可编辑 private Boolean canEdit; + + // 保留小数位数 + private Integer pattern; } @Data diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index f7a8b277e..ff9147988 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -376,6 +376,7 @@ public class SalaryArchiveWrapper extends Service { salaryItemMap.put("name", s.getName()); salaryItemMap.put("value", optionalItem.isPresent() ? optionalItem.get().getItemValue() : ""); salaryItemMap.put("dataType", s.getDataType()); + salaryItemMap.put("pattern", s.getPattern()); salaryItems.add(salaryItemMap); }); From c1db3883b0eb88aaa5e0ed7849408871a26e32ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sun, 27 Aug 2023 20:10:31 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=97=B6=E6=9A=B4?= =?UTF-8?q?=E9=9C=B2=E6=97=A5=E6=9C=9F=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/formlua/func/date/DateTimeServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/engine/salary/formlua/func/date/DateTimeServiceImpl.java b/src/com/engine/salary/formlua/func/date/DateTimeServiceImpl.java index fa6bbd7bc..07fa4c8ae 100644 --- a/src/com/engine/salary/formlua/func/date/DateTimeServiceImpl.java +++ b/src/com/engine/salary/formlua/func/date/DateTimeServiceImpl.java @@ -296,6 +296,7 @@ public class DateTimeServiceImpl implements DateTimeService { reuslt = year; } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, reuslt); @@ -328,6 +329,7 @@ public class DateTimeServiceImpl implements DateTimeService { reuslt = month + 1; } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, reuslt); @@ -356,6 +358,7 @@ public class DateTimeServiceImpl implements DateTimeService { reuslt = day; } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, reuslt); @@ -385,6 +388,7 @@ public class DateTimeServiceImpl implements DateTimeService { reuslt = hour; } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, reuslt); @@ -414,6 +418,7 @@ public class DateTimeServiceImpl implements DateTimeService { reuslt = minute; } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, reuslt); @@ -440,6 +445,7 @@ public class DateTimeServiceImpl implements DateTimeService { reuslt = seconds; } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, reuslt); @@ -466,6 +472,7 @@ public class DateTimeServiceImpl implements DateTimeService { weekNum = getDateTimeValue(date, "WM", "WEEKNUM"); } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, weekNum); } @@ -963,6 +970,7 @@ public class DateTimeServiceImpl implements DateTimeService { weekDay = getDateTimeValue(new Date(), "DW", "WEEKDAY"); } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return new DataType(DataType.NUMBER, weekDay > 0 ? (weekDay - 1) : weekDay); } @@ -1099,6 +1107,7 @@ public class DateTimeServiceImpl implements DateTimeService { ndate = sdf.parse(dateStr); } catch (ParseException e) { logger.error("err", e); + throw new RuntimeException(e); } return ndate; } From bd1a6b7a9afb9443d79926c18f623923ac7d7d9d Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 28 Aug 2023 22:22:00 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E5=9C=A8=E4=B8=AA=E7=A8=8E=E6=89=A3?= =?UTF-8?q?=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA=E9=9D=9E=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E8=AF=AF=E5=88=A0=E9=99=A4=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=8C=83=E5=9B=B4=E5=9C=A8hrsa=5Ftax=5Fagent?= =?UTF-8?q?=5Femp=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/impl/TaxAgentEmpServiceImpl.java | 2 +- .../service/impl/TaxAgentManageRangeServiceImpl.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java index cc2d23985..7cd9cfd6f 100644 --- a/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentEmpServiceImpl.java @@ -172,7 +172,7 @@ public class TaxAgentEmpServiceImpl extends Service implements TaxAgentEmpServic return; } List taxAgentIds = taxAgentEmpSaveParamList.stream().map(TaxAgentEmpSaveParam::getTaxAgentId).collect(Collectors.toList()); - List taxAgentEmployeeExistList = this.listByTaxAgentIds(taxAgentIds, UseEmployeeTypeEnum.ORG); + List taxAgentEmployeeExistList = this.listByTaxAgentIds(taxAgentIds, UseEmployeeTypeEnum.EXT); Date now = new Date(); // 关联表 List taxAgentEmployeeAddList = Lists.newArrayList(); diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 06cdeb04f..4486790f7 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -429,6 +429,10 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM getTaxAgentExtRangeMapper().insertIgnoreNull(po); }); + List oldEmpList = getExtEmpService(user).getEmployeeByIds(oldIds); + employees.addAll(oldEmpList); + // 去重 + employees = employees.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(e -> e.getEmployeeId()))), ArrayList::new)); /* 同步本地人员范围的关联人员=========================== */ @@ -436,8 +440,9 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM //同步执行 syncLocalExtEmp(taxAgentId, employees); } else { + List finalEmployees = employees; taskExecutor.execute(() -> { - syncLocalExtEmp(taxAgentId, employees); + syncLocalExtEmp(taxAgentId, finalEmployees); }); } } From 28fff1f5191ffd5d1f00a8ed66fdad8c4f609712 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 29 Aug 2023 11:46:06 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=EF=BC=8C=E9=9D=9E=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BA=BA=E5=91=98=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=95=B0=E6=8D=AE=E4=B8=AD=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=BAnull=E5=A4=84=E7=90=86=E4=B8=BA=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryArchiveExcelServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java index a3c51c7ca..4b45a13f1 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java @@ -343,7 +343,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // row.add(e.get("incomeCategory").toString()); // row.add(e.get("salarySob").toString()); // row.add(e.get("hiredate")); - row.add(e.get("departmentName")); + row.add(Optional.ofNullable(e.get("departmentName")).orElse("").toString()); row.add(Optional.ofNullable(e.get("workcode")).orElse("").toString()); row.add(e.get("mobile") == null ? "" : e.get("mobile").toString()); row.add(Util.null2String(e.get("employeeStatus"))); From c1893f9152e8ac95624301ca2a5846369c1ae8bb Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 30 Aug 2023 10:41:00 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8F=91=E8=96=AA=E6=97=A5=E6=9C=9Ftemp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/EmployBiz.java | 9 +++ .../mapper/archive/SalaryArchiveMapper.java | 2 + .../mapper/archive/SalaryArchiveMapper.xml | 12 ++++ .../mapper/datacollection/EmployMapper.java | 6 ++ .../mapper/datacollection/EmployMapper.xml | 13 ++++ .../salary/service/SalaryArchiveService.java | 7 ++ .../salary/service/SalaryEmployeeService.java | 10 +-- .../impl/SalaryArchiveServiceImpl.java | 7 ++ .../impl/SalaryEmployeeServiceImpl.java | 14 ++++ .../AutoSyncResignationEmpArchiveJob.java | 69 +++++++++++++++++++ 10 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java diff --git a/src/com/engine/salary/biz/EmployBiz.java b/src/com/engine/salary/biz/EmployBiz.java index cc412c210..3599d68e0 100644 --- a/src/com/engine/salary/biz/EmployBiz.java +++ b/src/com/engine/salary/biz/EmployBiz.java @@ -161,4 +161,13 @@ public class EmployBiz extends BaseBean { } } + public List listByDismissDate(String dismissDate) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + EmployMapper mapper = sqlSession.getMapper(EmployMapper.class); + return mapper.listByDismissDate(dismissDate); + } finally { + sqlSession.close(); + } + } } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java index 14d179d2c..c25f47e55 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java @@ -131,4 +131,6 @@ public interface SalaryArchiveMapper { void deleteSuspendTodo(@Param("ids") Collection ids); void deleteByIds(@Param("ids")Collection deleteIds); + + List listPayEndDateIsNull(@Param("ids")List employeeIds); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 48b6acc51..450cd1e72 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -661,6 +661,18 @@ WHERE run_status is null + + UPDATE hrsa_salary_archive diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java index e2d0ada69..557198e80 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java @@ -102,4 +102,10 @@ public interface EmployMapper { * 根据部门id查询部门 */ DeptInfo getDeptInfoById(Long id); + + /** + * 获取大于离职日期的人员信息 + * @return + */ + List listByDismissDate(String dismissDate); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 0939b02d2..4e2a2640e 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -372,4 +372,17 @@ from hrmdepartment d where d.id = #{id} + \ No newline at end of file diff --git a/src/com/engine/salary/service/SalaryArchiveService.java b/src/com/engine/salary/service/SalaryArchiveService.java index 43f2efbda..c240adcf3 100644 --- a/src/com/engine/salary/service/SalaryArchiveService.java +++ b/src/com/engine/salary/service/SalaryArchiveService.java @@ -233,4 +233,11 @@ public interface SalaryArchiveService { * @param salaryArchiveIds */ void deleteSalaryArchive(Collection salaryArchiveIds); + + /** + * 根据人员id查询薪资档案 + * @param employeeIds + * @return + */ + List listPayEndDateIsNull(List employeeIds); } diff --git a/src/com/engine/salary/service/SalaryEmployeeService.java b/src/com/engine/salary/service/SalaryEmployeeService.java index 297b455c5..1832d4772 100644 --- a/src/com/engine/salary/service/SalaryEmployeeService.java +++ b/src/com/engine/salary/service/SalaryEmployeeService.java @@ -6,12 +6,9 @@ import com.engine.salary.entity.hrm.PositionInfo; import com.engine.salary.entity.hrm.SubCompanyInfo; import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; -import com.engine.salary.entity.hrm.DeptInfo; -import com.engine.salary.entity.hrm.PositionInfo; -import com.engine.salary.entity.hrm.SubCompanyInfo; -import com.engine.salary.entity.salarysob.param.SalarySobRangeEmpQueryParam; import java.util.List; +import java.util.Map; /** * 人员信息 @@ -97,4 +94,9 @@ public interface SalaryEmployeeService { List listByParams(List includeQueryParams); + /** + * 根据离职日期获取离职信息 + * @param formatDate + */ + Map getResignationMapByDate(String formatDate); } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index d96fd7a2b..72fe58f97 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -1285,4 +1285,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe return result; } + @Override + public List listPayEndDateIsNull(List employeeIds) { + if (CollectionUtils.isEmpty(employeeIds)) { + return Collections.emptyList(); + } + return getSalaryArchiveMapper().listPayEndDateIsNull(employeeIds); + } } diff --git a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java index fb2567f0c..6f0f8fb55 100644 --- a/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java @@ -269,4 +269,18 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee } return result; } + + /** + * 根据离职日期获取离职信息 + * @param dismissDate + * @return + */ + @Override + public Map getResignationMapByDate(String dismissDate) { + if (StringUtils.isBlank(dismissDate)) { + return Collections.emptyMap(); + } + List employeeList = employBiz.listByDismissDate(dismissDate); + return SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId, DataCollectionEmployee::getDismissdate); + } } diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java new file mode 100644 index 000000000..c558e4031 --- /dev/null +++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java @@ -0,0 +1,69 @@ +package com.engine.salary.timer; + +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; +import com.engine.salary.mapper.archive.SalaryArchiveMapper; +import com.engine.salary.service.SalaryArchiveService; +import com.engine.salary.service.SalaryEmployeeService; +import com.engine.salary.service.impl.SalaryArchiveServiceImpl; +import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import org.apache.commons.lang3.StringUtils; +import weaver.hrm.User; +import weaver.interfaces.schedule.BaseCronJob; + +import java.util.*; + +/** + * @author Harryxzy + * @ClassName AutoSyncInsuranceArchiveJob + * @date 2023/08/14 9:30 + * @description 自动同步离职人员社保福利档案内容 + */ +public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { + + private SalaryArchiveService getSalaryArchiveService(User user) { + return ServiceUtil.getService(SalaryArchiveServiceImpl.class,user); + } + + private SalaryEmployeeService getSalaryEmployeeService(User user) { + return ServiceUtil.getService(SalaryEmployeeServiceImpl.class,user); + } + + private SalaryArchiveMapper getSalaryArchiveMapper() { + return MapperProxyFactory.getProxy(SalaryArchiveMapper.class); + } + + private Integer preMonth; + + @Override + public void execute() { + User user = new User(); + user.setUid(1); + user.setLoginid("sysadmin"); + // 获取当前日到前3个月期间离职的人员id + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date()); + if (preMonth == null) { + preMonth = 3; + } + cal.add(Calendar.MONTH, -preMonth); + Map resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime())); + // 获取离职人员中没有设置最后缴纳月的档案 + List salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet())); + Date now = new Date(); + List needUpdateSalaryArchiveList = new ArrayList<>(); + for(SalaryArchivePO archive : salaryArchivePOS){ + String dismissDate = resignationMap.get(archive.getEmployeeId()); + if (StringUtils.isNotBlank(dismissDate)) { + archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate)); + archive.setUpdateTime(now); + needUpdateSalaryArchiveList.add(archive); + } + } + + + } + +} From bd75ef8d3b6aff445a33437396ba288ad4c09bc0 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 30 Aug 2023 13:09:56 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=A6=BB=E8=81=8C=E4=BA=BA=E5=91=98=E7=A4=BE=E4=BF=9D=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E3=80=81=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E7=BC=B4=E7=BA=B3=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 12 ++++ .../mapper/archive/SalaryArchiveMapper.xml | 7 +++ .../siarchives/InsuranceBaseInfoMapper.java | 7 +++ .../siarchives/InsuranceBaseInfoMapper.xml | 28 +++++++++ .../AutoSyncResignationEmpArchiveJob.java | 60 +++++++++++++++++-- 5 files changed, 108 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 9c89df464..a3d3f10ab 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1778,4 +1778,16 @@ public class SIArchivesBiz { return true; } + + /** + * 获取没有设置社保、公积金最后缴纳月的档案 + * @param employeeIds + * @return + */ + public List listEndDateIsNull(List employeeIds) { + if (CollectionUtils.isEmpty(employeeIds)) { + return Collections.emptyList(); + } + return getInsuranceBaseInfoMapper().listEndDateIsNull(employeeIds); + } } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 450cd1e72..69e5c299b 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -559,6 +559,13 @@ + + + + when id=#{item.id} then #{item.updateTime} + + + where id in diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java index b604d49ef..80e9c5e2e 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.java @@ -120,4 +120,11 @@ public interface InsuranceBaseInfoMapper { * @param po */ void updateById(InsuranceArchivesBaseInfoPO po); + + /** + * 获取没有设置社保、公积金最后缴纳月的档案 + * @param employeeIds + * @return + */ + List listEndDateIsNull(@Param("employeeIds") List employeeIds); } diff --git a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml index 6caa9ac34..467dbf9f2 100644 --- a/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/InsuranceBaseInfoMapper.xml @@ -272,6 +272,34 @@ AND payment_organization = #{paymentOrganization} + UPDATE hrsa_insurance_base_info diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java index c558e4031..1055b61d1 100644 --- a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java +++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java @@ -1,8 +1,16 @@ package com.engine.salary.timer; import com.engine.common.util.ServiceUtil; +import com.engine.salary.biz.SIArchivesBiz; import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; -import com.engine.salary.mapper.archive.SalaryArchiveMapper; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; +import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum; +import com.engine.salary.mapper.siarchives.FundSchemeMapper; +import com.engine.salary.mapper.siarchives.OtherSchemeMapper; +import com.engine.salary.mapper.siarchives.SocialSchemeMapper; import com.engine.salary.service.SalaryArchiveService; import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.service.impl.SalaryArchiveServiceImpl; @@ -31,8 +39,16 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { return ServiceUtil.getService(SalaryEmployeeServiceImpl.class,user); } - private SalaryArchiveMapper getSalaryArchiveMapper() { - return MapperProxyFactory.getProxy(SalaryArchiveMapper.class); + private SocialSchemeMapper getSocialSchemeMapper() { + return MapperProxyFactory.getProxy(SocialSchemeMapper.class); + } + + private FundSchemeMapper getFundSchemeMapper() { + return MapperProxyFactory.getProxy(FundSchemeMapper.class); + } + + private OtherSchemeMapper getOtherSchemeMapper() { + return MapperProxyFactory.getProxy(OtherSchemeMapper.class); } private Integer preMonth; @@ -46,11 +62,11 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); if (preMonth == null) { - preMonth = 3; + preMonth = 2; } cal.add(Calendar.MONTH, -preMonth); Map resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime())); - // 获取离职人员中没有设置最后缴纳月的档案 + // 获取离职人员中没有设置最后发薪日期的薪资档案 List salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet())); Date now = new Date(); List needUpdateSalaryArchiveList = new ArrayList<>(); @@ -58,12 +74,44 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { String dismissDate = resignationMap.get(archive.getEmployeeId()); if (StringUtils.isNotBlank(dismissDate)) { archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate)); + archive.setRunStatus(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()); archive.setUpdateTime(now); needUpdateSalaryArchiveList.add(archive); } } - + // 获取离职人员中没有设置最后缴纳月的社保福利档案 + SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + List needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); + now = new Date(); + // 设置社保、公积金最后缴纳月 + for(InsuranceArchivesBaseInfoPO po : needSyncList){ + String dismissDate = resignationMap.get(po.getEmployeeId()); + if (StringUtils.isNotEmpty(dismissDate)) { + dismissDate = StringUtils.substring(dismissDate,0,7); + // 更新社保最后缴纳月 + Long socialArchivesId = po.getSocialArchivesId(); + getSocialSchemeMapper().updateById(InsuranceArchivesSocialSchemePO.builder() + .id(socialArchivesId) + .socialEndTime(dismissDate) + .updateTime(now) + .build()); + // 更新公积金最后缴纳月 + Long fundArchivesId = po.getFundArchivesId(); + getFundSchemeMapper().updateById(InsuranceArchivesFundSchemePO.builder() + .id(fundArchivesId) + .fundEndTime(dismissDate) + .updateTime(now) + .build()); + // 更新企业年金及其他福利最后缴纳月 + Long otherArchivesId = po.getOtherArchivesId(); + getOtherSchemeMapper().updateById(InsuranceArchivesOtherSchemePO.builder() + .id(otherArchivesId) + .otherEndTime(dismissDate) + .updateTime(now) + .build()); + } + } } } From 4467f57928f7c465bf27999ab4782ef918b9d6d4 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 30 Aug 2023 13:26:25 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=96=B0=E5=BB=BA=E6=97=B6=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=97=A0=E5=88=86=E7=B1=BB=E5=90=8D=E5=AD=97=E6=B6=88=E5=A4=B1?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java index 050807ff0..893b0d55e 100644 --- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java +++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java @@ -143,6 +143,8 @@ public class SalaryTemplateBO { .id(String.valueOf(e.getSalaryItemId())) .salaryItemId(String.valueOf(e.getSalaryItemId())) .name(e.getName()) + .salaryItemShowName(e.getName()) + .originName(e.getName()) .sortedIndex(e.getSortedIndex()) .build()); }); From bf48341655be6be2661ce7f653732f0d660b5506 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 30 Aug 2023 15:10:25 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E5=A2=9E=E5=87=8F=E5=91=98=E8=BF=87=E6=BB=A4=E6=8E=89=E9=9D=9E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SIArchivesServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 10f674526..43f2052a5 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -14,6 +14,7 @@ import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; import com.engine.salary.entity.taxagent.po.TaxAgentEmpChangePO; import com.engine.salary.entity.taxagent.po.TaxAgentPO; +import com.engine.salary.enums.salaryaccounting.EmployeeTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; import com.engine.salary.enums.sicategory.DeleteTypeEnum; import com.engine.salary.enums.sicategory.NonPaymentEnum; @@ -873,7 +874,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService Collection taxAgentList = getTaxAgentService(user).listAllTaxAgents(currentEmployeeId); List paymentOrganizationList = taxAgentList.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - Collection stayDelIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue()) && paymentOrganizationList.contains(f.getPaymentOrganization())) + Collection stayDelIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_DEL.getValue()) + && paymentOrganizationList.contains(f.getPaymentOrganization()) + && (f.getEmployeeType() == null || Objects.equals(f.getEmployeeType(), EmployeeTypeEnum.ORGANIZATION.getValue()))) .map(InsuranceArchivesBaseInfoPO::getId).collect(Collectors.toList()); if (stayDelIds.size() > 0) { return stayDelToStop(stayDelIds); @@ -1050,7 +1053,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService Collection taxAgentList = getTaxAgentService(user).listAllTaxAgents(currentEmployeeId); List paymentOrganizationList = taxAgentList.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); - Collection stayAddIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue()) && paymentOrganizationList.contains(f.getPaymentOrganization())) + Collection stayAddIds = allBaseInfoList.stream().filter(f->f.getRunStatus().equals(EmployeeStatusEnum.STAY_ADD.getValue()) + && paymentOrganizationList.contains(f.getPaymentOrganization()) + && (f.getEmployeeType() == null || Objects.equals(f.getEmployeeType(), EmployeeTypeEnum.ORGANIZATION.getValue()))) .map(InsuranceArchivesBaseInfoPO::getId).collect(Collectors.toList()); if (stayAddIds.size() > 0) { return stayAddToPay(stayAddIds); From 64f64c4f892f03ed20bcfbf81f68117f4e1bfbe3 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 30 Aug 2023 15:34:54 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=A6=BB=E8=81=8C=E4=BA=BA=E5=91=98=E7=BB=93=E6=9D=9F=E5=8F=91?= =?UTF-8?q?=E8=96=AA=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datacollection/EmployMapper.xml | 2 +- .../mapper/siarchives/FundSchemeMapper.java | 7 +++++ .../mapper/siarchives/FundSchemeMapper.xml | 6 ++++ .../mapper/siarchives/OtherSchemeMapper.java | 7 +++++ .../mapper/siarchives/OtherSchemeMapper.xml | 7 +++++ .../mapper/siarchives/SocialSchemeMapper.java | 7 +++++ .../mapper/siarchives/SocialSchemeMapper.xml | 7 +++++ .../AutoSyncResignationEmpArchiveJob.java | 31 ++++++------------- 8 files changed, 52 insertions(+), 22 deletions(-) diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 4e2a2640e..b54ee6cba 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -380,7 +380,7 @@ e.workcode as workcode, e.companystartdate as companystartdate, e.mobile as mobile, - e.enddate as dismissdate, + e.enddate as dismissdate from hrmresource e where e.status not in (7) AND e.enddate >= #{dismissDate} diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java index ca0cb78fb..203509ca1 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java @@ -91,4 +91,11 @@ public interface FundSchemeMapper { * @param insuranceArchivesFundSchemePO */ void insert(InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO); + + /** + * 更新最后缴纳月 + * @param id + * @param endTime + */ + void updateEndTime(@Param("id")Long id, @Param("endTime")String endTime); } diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index 8590a88e6..0b8f650b7 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -327,6 +327,12 @@ + + UPDATE hrsa_fund_archives + SET fund_end_time = #{endTime} + WHERE delete_type = 0 + AND id = #{id} + diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java index 26d684d21..5281c07ce 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java @@ -83,4 +83,11 @@ public interface OtherSchemeMapper { * @param insuranceArchivesOtherSchemePO */ void insert(InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO); + + /** + * 更新最后缴纳月 + * @param id + * @param endTime + */ + void updateEndTime(@Param("id")Long id, @Param("endTime")String endTime); } diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml index 74c514a6e..9ab21e2f4 100644 --- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml @@ -306,6 +306,13 @@ + + UPDATE hrsa_other_archives + SET other_end_time = #{endTime} + WHERE delete_type = 0 + AND id = #{id} + + INSERT INTO hrsa_other_archives( other_scheme_id, diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java index b2857ba99..26b174dc8 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java @@ -121,4 +121,11 @@ public interface SocialSchemeMapper { * @param insuranceArchivesSocialSchemePO */ void insert(InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO); + + /** + * 更新最后缴纳月 + * @param id + * @param endTime + */ + void updateEndTime(@Param("id")Long id, @Param("endTime")String endTime); } diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index cc73ff033..8ee102829 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -970,6 +970,13 @@ + + UPDATE hrsa_social_archives + SET social_end_time = #{endTime} + WHERE delete_type = 0 AND id = #{id} + + + INSERT INTO hrsa_social_archives( welfare_type, diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java index 1055b61d1..8039af208 100644 --- a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java +++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java @@ -2,12 +2,9 @@ package com.engine.salary.timer; import com.engine.common.util.ServiceUtil; import com.engine.salary.biz.SIArchivesBiz; +import com.engine.salary.biz.SalaryArchiveBiz; import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.entity.siarchives.po.InsuranceArchivesBaseInfoPO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; -import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; -import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum; import com.engine.salary.mapper.siarchives.FundSchemeMapper; import com.engine.salary.mapper.siarchives.OtherSchemeMapper; import com.engine.salary.mapper.siarchives.SocialSchemeMapper; @@ -17,6 +14,7 @@ import com.engine.salary.service.impl.SalaryArchiveServiceImpl; import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.db.MapperProxyFactory; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import weaver.hrm.User; import weaver.interfaces.schedule.BaseCronJob; @@ -39,6 +37,8 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { return ServiceUtil.getService(SalaryEmployeeServiceImpl.class,user); } + private SalaryArchiveBiz getSalaryArchiveMapper = new SalaryArchiveBiz(); + private SocialSchemeMapper getSocialSchemeMapper() { return MapperProxyFactory.getProxy(SocialSchemeMapper.class); } @@ -74,16 +74,17 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { String dismissDate = resignationMap.get(archive.getEmployeeId()); if (StringUtils.isNotBlank(dismissDate)) { archive.setPayEndDate(SalaryDateUtil.dateStrToLocalDate(dismissDate)); - archive.setRunStatus(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()); archive.setUpdateTime(now); needUpdateSalaryArchiveList.add(archive); } } + if (CollectionUtils.isNotEmpty(needUpdateSalaryArchiveList)) { + getSalaryArchiveMapper.batchUpdate(needUpdateSalaryArchiveList); + } // 获取离职人员中没有设置最后缴纳月的社保福利档案 SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); List needSyncList = siArchivesBiz.listEndDateIsNull(new ArrayList<>(resignationMap.keySet())); - now = new Date(); // 设置社保、公积金最后缴纳月 for(InsuranceArchivesBaseInfoPO po : needSyncList){ String dismissDate = resignationMap.get(po.getEmployeeId()); @@ -91,25 +92,13 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { dismissDate = StringUtils.substring(dismissDate,0,7); // 更新社保最后缴纳月 Long socialArchivesId = po.getSocialArchivesId(); - getSocialSchemeMapper().updateById(InsuranceArchivesSocialSchemePO.builder() - .id(socialArchivesId) - .socialEndTime(dismissDate) - .updateTime(now) - .build()); + getSocialSchemeMapper().updateEndTime(socialArchivesId, dismissDate); // 更新公积金最后缴纳月 Long fundArchivesId = po.getFundArchivesId(); - getFundSchemeMapper().updateById(InsuranceArchivesFundSchemePO.builder() - .id(fundArchivesId) - .fundEndTime(dismissDate) - .updateTime(now) - .build()); + getFundSchemeMapper().updateEndTime(fundArchivesId, dismissDate); // 更新企业年金及其他福利最后缴纳月 Long otherArchivesId = po.getOtherArchivesId(); - getOtherSchemeMapper().updateById(InsuranceArchivesOtherSchemePO.builder() - .id(otherArchivesId) - .otherEndTime(dismissDate) - .updateTime(now) - .build()); + getOtherSchemeMapper().updateEndTime(otherArchivesId, dismissDate); } } } From b90066e8b77022a6aced38a9af661b8232d8e696 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 31 Aug 2023 13:03:04 +0800 Subject: [PATCH 19/25] fixbug --- .../salary/timer/AutoSyncResignationEmpArchiveJob.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java index 8039af208..b62f8ce6d 100644 --- a/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java +++ b/src/com/engine/salary/timer/AutoSyncResignationEmpArchiveJob.java @@ -16,6 +16,7 @@ import com.engine.salary.util.SalaryDateUtil; import com.engine.salary.util.db.MapperProxyFactory; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import weaver.hrm.User; import weaver.interfaces.schedule.BaseCronJob; @@ -51,7 +52,7 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { return MapperProxyFactory.getProxy(OtherSchemeMapper.class); } - private Integer preMonth; + private String preMonth; @Override public void execute() { @@ -61,10 +62,11 @@ public class AutoSyncResignationEmpArchiveJob extends BaseCronJob { // 获取当前日到前3个月期间离职的人员id Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); - if (preMonth == null) { - preMonth = 2; + int preMonthValue = -2; + if (preMonth != null && NumberUtils.isCreatable(preMonth)) { + preMonthValue = -1 * Integer.valueOf(preMonth); } - cal.add(Calendar.MONTH, -preMonth); + cal.add(Calendar.MONTH, preMonthValue); Map resignationMap = getSalaryEmployeeService(user).getResignationMapByDate(SalaryDateUtil.getFormatDate(cal.getTime())); // 获取离职人员中没有设置最后发薪日期的薪资档案 List salaryArchivePOS = getSalaryArchiveService(user).listPayEndDateIsNull(new ArrayList<>(resignationMap.keySet())); From cd5e5d22840596557222129a3a83fd143f324f20 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 31 Aug 2023 14:04:41 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-ST?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=82=E9=85=8D=EF=BC=8C=E7=A5=9E?= =?UTF-8?q?=E9=80=9A=E6=95=B0=E6=8D=AE=E5=BA=93-=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E9=9D=9E=E6=A0=87=E5=88=9D=E5=A7=8B=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/ST/sql202205100201.sql | 455 ++++ resource/sqlupgrade/ST/sql202205100402.sql | 269 +++ resource/sqlupgrade/ST/sql202205130903.sql | 2460 ++++++++++++++++++++ resource/sqlupgrade/ST/sql202205200203.sql | 13 + resource/sqlupgrade/ST/sql202205310203.sql | 48 + resource/sqlupgrade/ST/sql202206071403.sql | 132 ++ resource/sqlupgrade/ST/sql202206090403.sql | 10 + resource/sqlupgrade/ST/sql202206141003.sql | 45 + resource/sqlupgrade/ST/sql202206160500.sql | 41 + resource/sqlupgrade/ST/sql202206230403.sql | 30 + resource/sqlupgrade/ST/sql202207110803.sql | 23 + resource/sqlupgrade/ST/sql202207120303.sql | 15 + resource/sqlupgrade/ST/sql202207210203.sql | 7 + resource/sqlupgrade/ST/sql202208051103.sql | 138 ++ resource/sqlupgrade/ST/sql202208080403.sql | 54 + resource/sqlupgrade/ST/sql202208240403.sql | 6 + resource/sqlupgrade/ST/sql202208240503.sql | 17 + resource/sqlupgrade/ST/sql202209010603.sql | 6 + resource/sqlupgrade/ST/sql202209050303.sql | 6 + resource/sqlupgrade/ST/sql202210080203.sql | 95 + resource/sqlupgrade/ST/sql202210080403.sql | 7 + resource/sqlupgrade/ST/sql202210170203.sql | 31 + resource/sqlupgrade/ST/sql202210170303.sql | 3 + resource/sqlupgrade/ST/sql202211090103.sql | 42 + resource/sqlupgrade/ST/sql202211090301.sql | 119 + resource/sqlupgrade/ST/sql202211090402.sql | 59 + resource/sqlupgrade/ST/sql202211170503.sql | 8 + resource/sqlupgrade/ST/sql202212080903.sql | 70 + resource/sqlupgrade/ST/sql202212081003.sql | 61 + resource/sqlupgrade/ST/sql202212230103.sql | 49 + resource/sqlupgrade/ST/sql202301310403.sql | 93 + resource/sqlupgrade/ST/sql202302060801.sql | 47 + resource/sqlupgrade/ST/sql202302060902.sql | 44 + resource/sqlupgrade/ST/sql202302090303.sql | 9 + resource/sqlupgrade/ST/sql202303130101.sql | 23 + resource/sqlupgrade/ST/sql202303130202.sql | 14 + resource/sqlupgrade/ST/sql202303150403.sql | 74 + resource/sqlupgrade/ST/sql202304040503.sql | 67 + resource/sqlupgrade/ST/sql202304260103.sql | 3 + resource/sqlupgrade/ST/sql202304270203.sql | 245 ++ resource/sqlupgrade/ST/sql202304270303.sql | 12 + resource/sqlupgrade/ST/sql202304270501.sql | 23 + resource/sqlupgrade/ST/sql202305050302.sql | 14 + resource/sqlupgrade/ST/sql202305170903.sql | 14 + resource/sqlupgrade/ST/sql202306020403.sql | 2 + resource/sqlupgrade/ST/sql202306020603.sql | 7 + resource/sqlupgrade/ST/sql202306080103.sql | 2 + resource/sqlupgrade/ST/sql202306200203.sql | 5 + resource/sqlupgrade/ST/sql202306260103.sql | 13 + resource/sqlupgrade/ST/sql202307100103.sql | 16 + resource/sqlupgrade/ST/sql202307170403.sql | 24 + resource/sqlupgrade/ST/sql202307180603.sql | 4 + resource/sqlupgrade/ST/sql202307200603.sql | 14 + resource/sqlupgrade/ST/sql202308080403.sql | 12 + resource/sqlupgrade/ST/sql202308080503.sql | 14 + resource/sqlupgrade/ST/sql202308090203.sql | 6 +- resource/sqlupgrade/ST/sql202308170403.sql | 9 + 57 files changed, 5126 insertions(+), 3 deletions(-) create mode 100644 resource/sqlupgrade/ST/sql202205100201.sql create mode 100644 resource/sqlupgrade/ST/sql202205100402.sql create mode 100644 resource/sqlupgrade/ST/sql202205130903.sql create mode 100644 resource/sqlupgrade/ST/sql202205200203.sql create mode 100644 resource/sqlupgrade/ST/sql202205310203.sql create mode 100644 resource/sqlupgrade/ST/sql202206071403.sql create mode 100644 resource/sqlupgrade/ST/sql202206090403.sql create mode 100644 resource/sqlupgrade/ST/sql202206141003.sql create mode 100644 resource/sqlupgrade/ST/sql202206160500.sql create mode 100644 resource/sqlupgrade/ST/sql202206230403.sql create mode 100644 resource/sqlupgrade/ST/sql202207110803.sql create mode 100644 resource/sqlupgrade/ST/sql202207120303.sql create mode 100644 resource/sqlupgrade/ST/sql202207210203.sql create mode 100644 resource/sqlupgrade/ST/sql202208051103.sql create mode 100644 resource/sqlupgrade/ST/sql202208080403.sql create mode 100644 resource/sqlupgrade/ST/sql202208240403.sql create mode 100644 resource/sqlupgrade/ST/sql202208240503.sql create mode 100644 resource/sqlupgrade/ST/sql202209010603.sql create mode 100644 resource/sqlupgrade/ST/sql202209050303.sql create mode 100644 resource/sqlupgrade/ST/sql202210080203.sql create mode 100644 resource/sqlupgrade/ST/sql202210080403.sql create mode 100644 resource/sqlupgrade/ST/sql202210170203.sql create mode 100644 resource/sqlupgrade/ST/sql202210170303.sql create mode 100644 resource/sqlupgrade/ST/sql202211090103.sql create mode 100644 resource/sqlupgrade/ST/sql202211090301.sql create mode 100644 resource/sqlupgrade/ST/sql202211090402.sql create mode 100644 resource/sqlupgrade/ST/sql202211170503.sql create mode 100644 resource/sqlupgrade/ST/sql202212080903.sql create mode 100644 resource/sqlupgrade/ST/sql202212081003.sql create mode 100644 resource/sqlupgrade/ST/sql202212230103.sql create mode 100644 resource/sqlupgrade/ST/sql202301310403.sql create mode 100644 resource/sqlupgrade/ST/sql202302060801.sql create mode 100644 resource/sqlupgrade/ST/sql202302060902.sql create mode 100644 resource/sqlupgrade/ST/sql202302090303.sql create mode 100644 resource/sqlupgrade/ST/sql202303130101.sql create mode 100644 resource/sqlupgrade/ST/sql202303130202.sql create mode 100644 resource/sqlupgrade/ST/sql202303150403.sql create mode 100644 resource/sqlupgrade/ST/sql202304040503.sql create mode 100644 resource/sqlupgrade/ST/sql202304260103.sql create mode 100644 resource/sqlupgrade/ST/sql202304270203.sql create mode 100644 resource/sqlupgrade/ST/sql202304270303.sql create mode 100644 resource/sqlupgrade/ST/sql202304270501.sql create mode 100644 resource/sqlupgrade/ST/sql202305050302.sql create mode 100644 resource/sqlupgrade/ST/sql202305170903.sql create mode 100644 resource/sqlupgrade/ST/sql202306020403.sql create mode 100644 resource/sqlupgrade/ST/sql202306020603.sql create mode 100644 resource/sqlupgrade/ST/sql202306080103.sql create mode 100644 resource/sqlupgrade/ST/sql202306200203.sql create mode 100644 resource/sqlupgrade/ST/sql202306260103.sql create mode 100644 resource/sqlupgrade/ST/sql202307100103.sql create mode 100644 resource/sqlupgrade/ST/sql202307170403.sql create mode 100644 resource/sqlupgrade/ST/sql202307180603.sql create mode 100644 resource/sqlupgrade/ST/sql202307200603.sql create mode 100644 resource/sqlupgrade/ST/sql202308080403.sql create mode 100644 resource/sqlupgrade/ST/sql202308080503.sql create mode 100644 resource/sqlupgrade/ST/sql202308170403.sql diff --git a/resource/sqlupgrade/ST/sql202205100201.sql b/resource/sqlupgrade/ST/sql202205100201.sql new file mode 100644 index 000000000..a4930cad6 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202205100201.sql @@ -0,0 +1,455 @@ +delete from HtmlLabelIndex where id = 537997 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 537997,'н' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537997 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537997 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537997 as indexid ,'н' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537997 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537997 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537997 as indexid ,'Salary management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537997 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537997 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537997 as indexid ,'н' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537997 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 537998 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 537998,'ҵнʸ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537998 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537998 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537998 as indexid ,'ҵнʸ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537998 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537998 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537998 as indexid ,'My salary and benefits' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537998 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537998 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537998 as indexid ,'ҵнY' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537998 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 537996 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 537996,'˰۽' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537996 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537996 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537996 as indexid ,'˰۽' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537996 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537996 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537996 as indexid ,'Individual income tax withholding agent' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537996 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537996 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537996 as indexid ,'Ux' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537996 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 537999 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 537999,'籣' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 537999 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537999 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537999 as indexid ,'籣' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537999 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537999 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537999 as indexid ,'Social security benefits' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537999 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 537999 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 537999 as indexid ,'籣' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 537999 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538000 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538000,'籣' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538000 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538000 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538000 as indexid ,'籣' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538000 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538000 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538000 as indexid ,'Social security welfare scheme' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538000 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538000 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538000 as indexid ,'籣' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538000 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538001 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538001,'籣' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538001 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538001 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538001 as indexid ,'籣' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538001 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538001 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538001 as indexid ,'Social security benefit file' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538001 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538001 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538001 as indexid ,'籣n' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538001 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538002 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538002,'籣̨' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538002 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538002 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538002 as indexid ,'籣̨' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538002 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538002 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538002 as indexid ,'Social security benefit account' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538002 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538002 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538002 as indexid ,'籣̨~' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538002 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538003 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538003,'нĿ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538003 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538003 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538003 as indexid ,'нĿ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538003 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538003 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538003 as indexid ,'Salary item management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538003 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538003 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538003 as indexid ,'нYĿ' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538003 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538004 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538004,'нʵ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538004 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538004 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538004 as indexid ,'нʵ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538004 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538004 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538004 as indexid ,'Salary file' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538004 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538004 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538004 as indexid ,'нYn' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538004 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538005 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538005,'ݲɼ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538005 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538005 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538005 as indexid ,'ݲɼ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538005 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538005 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538005 as indexid ,'data acquisition' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538005 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538005 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538005 as indexid ,'' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538005 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538006 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538006,'ۼרӿ۳' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538006 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538006 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538006 as indexid ,'ۼרӿ۳' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538006 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538006 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538006 as indexid ,'Accumulated special additional deduction' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538006 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538006 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538006 as indexid ,'Ӌ헸ӿ۳' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538006 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538007 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538007,'˰۳' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538007 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538007 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538007 as indexid ,'˰۳' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538007 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538007 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538007 as indexid ,'Other tax exempt deductions' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538007 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538007 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538007 as indexid ,'ⶐ۳' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538007 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538008 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538008,'ۼ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538008 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538008 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538008 as indexid ,'ۼ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538008 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538008 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538008 as indexid ,'Cumulative situation in previous periods' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538008 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538008 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538008 as indexid ,'Ӌr' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538008 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538009 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538009,'' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538009 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538009 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538009 as indexid ,'' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538009 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538009 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538009 as indexid ,'Attendance reference' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538009 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538009 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538009 as indexid ,'' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538009 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538010 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538010,'н' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538010 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538010 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538010 as indexid ,'н' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538010 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538010 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538010 as indexid ,'Salary a / C set' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538010 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538010 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538010 as indexid ,'нY~' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538010 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538011 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538011,'нʺ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538011 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538011 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538011 as indexid ,'нʺ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538011 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538011 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538011 as indexid ,'Salary accounting' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538011 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538011 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538011 as indexid ,'нY' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538011 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538012 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538012,'ʵ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538012 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538012 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538012 as indexid ,'ʵ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538012 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538012 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538012 as indexid ,'Payroll payment' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538012 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538012 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538012 as indexid ,'Yΰl' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538012 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538013 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538013,'˰걨' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538013 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538013 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538013 as indexid ,'˰걨' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538013 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538013 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538013 as indexid ,'Individual income tax return' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538013 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538013 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538013 as indexid ,'' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538013 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 538014 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 538014,'˰˰ʱ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 538014 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538014 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538014 as indexid ,'˰˰ʱ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538014 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538014 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538014 as indexid ,'Individual income tax rate table' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538014 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 538014 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 538014 as indexid ,'ʱ' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 538014 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202205100402.sql b/resource/sqlupgrade/ST/sql202205100402.sql new file mode 100644 index 000000000..d297514d6 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202205100402.sql @@ -0,0 +1,269 @@ +Delete from LeftMenuInfo where id=100118; +/ + +Delete from LeftMenuConfig where infoid=100118; +/ + +call LMConfig_U_ByInfoInsert (1,0,-1); +/ + +call LMInfo_Insert (100118,537997,NULL,NULL,1,0,-1,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100118; +/ + +Delete from LeftMenuInfo where id=100132; +/ + +Delete from LeftMenuConfig where infoid=100132; +/ + +call LMConfig_U_ByInfoInsert (2,100118,5); +/ + +call LMInfo_Insert (100132,538011,'','',2,100118,5,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/calculate' where id = 100132; +/ + +Delete from LeftMenuInfo where id=100125; +/ + +Delete from LeftMenuConfig where infoid=100125; +/ + +call LMConfig_U_ByInfoInsert (2,100118,2); +/ + +call LMInfo_Insert (100125,538004,'','',2,100118,2,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/salaryFile' where id = 100125; +/ + +Delete from LeftMenuInfo where id=100130; +/ + +Delete from LeftMenuConfig where infoid=100130; +/ + +call LMConfig_U_ByInfoInsert (2,100126,0); +/ + +call LMInfo_Insert (100130,538009,'','',2,100126,0,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/attendance' where id = 100130; +/ + +Delete from LeftMenuInfo where id=100129; +/ + +Delete from LeftMenuConfig where infoid=100129; +/ + +call LMConfig_U_ByInfoInsert (2,100126,0); +/ + +call LMInfo_Insert (100129,538008,'','',2,100126,0,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/cumSituation' where id = 100129; +/ + +Delete from LeftMenuInfo where id=100120; +/ + +Delete from LeftMenuConfig where infoid=100120; +/ + +call LMConfig_U_ByInfoInsert (2,100118,0); +/ + +call LMInfo_Insert (100120,537999,'','',2,100118,0,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100120; +/ + +Delete from LeftMenuInfo where id=100123; +/ + +Delete from LeftMenuConfig where infoid=100123; +/ + +call LMConfig_U_ByInfoInsert (2,100120,1); +/ + +call LMInfo_Insert (100123,538002,'','',2,100120,1,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/standingBook' where id = 100123; +/ + +Delete from LeftMenuInfo where id=100122; +/ + +Delete from LeftMenuConfig where infoid=100122; +/ + +call LMConfig_U_ByInfoInsert (2,100120,0); +/ + +call LMInfo_Insert (100122,538001,'','',2,100120,0,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/archives' where id = 100122; +/ + +Delete from LeftMenuInfo where id=100135; +/ + +Delete from LeftMenuConfig where infoid=100135; +/ + +call LMConfig_U_ByInfoInsert (2,100118,8); +/ + +call LMInfo_Insert (100135,537996,'','',2,100118,8,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/taxAgent' where id = 100135; +/ + +Delete from LeftMenuInfo where id=100121; +/ + +Delete from LeftMenuConfig where infoid=100121; +/ + +call LMConfig_U_ByInfoInsert (2,100120,-1); +/ + +call LMInfo_Insert (100121,538000,'','',2,100120,-1,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/socialSecurityBenefits/programme' where id = 100121; +/ + +Delete from LeftMenuInfo where id=100126; +/ + +Delete from LeftMenuConfig where infoid=100126; +/ + +call LMConfig_U_ByInfoInsert (2,100118,3); +/ + +call LMInfo_Insert (100126,538005,'','',2,100118,3,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100126; +/ + +Delete from LeftMenuInfo where id=100127; +/ + +Delete from LeftMenuConfig where infoid=100127; +/ + +call LMConfig_U_ByInfoInsert (2,100126,-1); +/ + +call LMInfo_Insert (100127,538006,'','',2,100126,-1,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/cumDeduct' where id = 100127; +/ + +Delete from LeftMenuInfo where id=100133; +/ + +Delete from LeftMenuConfig where infoid=100133; +/ + +call LMConfig_U_ByInfoInsert (2,100118,6); +/ + +call LMInfo_Insert (100133,538012,'','',2,100118,6,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/payroll' where id = 100133; +/ + +Delete from LeftMenuInfo where id=100128; +/ + +Delete from LeftMenuConfig where infoid=100128; +/ + +call LMConfig_U_ByInfoInsert (2,100126,0); +/ + +call LMInfo_Insert (100128,538007,'','',2,100126,0,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/otherDeduct' where id = 100128; +/ + +Delete from LeftMenuInfo where id=100119; +/ + +Delete from LeftMenuConfig where infoid=100119; +/ + +call LMConfig_U_ByInfoInsert (2,100118,-1); +/ + +call LMInfo_Insert (100119,537998,'','',2,100118,-1,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/mySalary' where id = 100119; +/ + +Delete from LeftMenuInfo where id=100131; +/ + +Delete from LeftMenuConfig where infoid=100131; +/ + +call LMConfig_U_ByInfoInsert (2,100118,4); +/ + +call LMInfo_Insert (100131,538010,'','',2,100118,4,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/ledger' where id = 100131; +/ + +Delete from LeftMenuInfo where id=100124; +/ + +Delete from LeftMenuConfig where infoid=100124; +/ + +call LMConfig_U_ByInfoInsert (2,100118,1); +/ + +call LMInfo_Insert (100124,538003,'','',2,100118,1,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/salaryItem' where id = 100124; +/ + +Delete from LeftMenuInfo where id=100134; +/ + +Delete from LeftMenuConfig where infoid=100134; +/ + +call LMConfig_U_ByInfoInsert (2,100118,7); +/ + +call LMInfo_Insert (100134,538013,'','',2,100118,7,2); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/declare' where id = 100134; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202205130903.sql b/resource/sqlupgrade/ST/sql202205130903.sql new file mode 100644 index 000000000..b06606fc3 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202205130903.sql @@ -0,0 +1,2460 @@ +CREATE TABLE hrsa_acct_result_temp( + id NUMBER(38,0) primary key NOT NULL, + calculate_key varchar2(50) DEFAULT '', + salary_sob_id NUMBER(38,0) DEFAULT 0, + salary_acct_emp_id NUMBER(38,0) DEFAULT 0, + salary_acct_record_id NUMBER(38,0) DEFAULT 0, + employee_id NUMBER(38,0) DEFAULT 0, + tax_agent_id NUMBER(38,0) DEFAULT 0, + salary_item_id NUMBER(38,0) DEFAULT 0, + result_value varchar2(1000) DEFAULT '', + creator NUMBER(38,0) DEFAULT '0', + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +create sequence hrsa_acct_result_temp_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_acct_result_temp_Tri +before insert on hrsa_acct_result_temp +for each row +begin +select hrsa_acct_result_temp_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_add_up_deduction ( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + declare_month DATE DEFAULT sysdate, + add_up_child_education varchar2(255) DEFAULT '', + add_up_continuing_education varchar2(255) DEFAULT '', + add_up_housing_loan_interest varchar2(255) DEFAULT '', + add_up_housing_rent varchar2(255) DEFAULT '' , + add_up_support_elderly varchar2(255) DEFAULT '' , + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0 , + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' + ); +/ + +create sequence hrsa_add_up_deduction_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_add_up_deduction_Tri +before insert on hrsa_add_up_deduction +for each row +begin +select hrsa_add_up_deduction_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_add_up_situation( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + tax_year_month date DEFAULT sysdate, + year NUMBER(38,0) DEFAULT 0, + add_up_income varchar2(255) DEFAULT '' , + add_up_subtraction varchar2(255) DEFAULT '' , + add_up_social_security_total varchar2(255) DEFAULT '' , + add_up_accumulation_fund_total varchar2(255) DEFAULT '' , + add_up_child_education varchar2(255) DEFAULT '' , + add_up_continuing_education varchar2(255) DEFAULT '' , + add_up_housing_loan_interest varchar2(255) DEFAULT '' , + add_up_housing_rent varchar2(255) DEFAULT '' , + add_up_support_elderly varchar2(255) DEFAULT '' , + add_up_enterprise_and_other varchar2(255) DEFAULT '', + add_up_other_deduction varchar2(255) DEFAULT '0.00000', + add_up_tax_exempt_income varchar2(255) DEFAULT '' , + add_up_allowed_donation varchar2(255) DEFAULT '' , + add_up_advance_tax varchar2(255) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0 , + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' + ); +/ + +create sequence hrsa_add_up_situation_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_add_up_situation_Tri +before insert on hrsa_add_up_situation +for each row +begin +select hrsa_add_up_situation_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_attend_quote( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_year_month date NOT NULL, + year number DEFAULT 0, + month number DEFAULT 0, + salary_sob_id NUMBER(38,0) DEFAULT '', + source_type number DEFAULT 0, + salary_accounting_status number DEFAULT 0, + attend_cycle varchar2(100) DEFAULT '' , + salary_cycle varchar2(100) DEFAULT '' , + description varchar2(100) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' + ); +/ + +create sequence hrsa_attend_quote_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_attend_quote_Tri +before insert on hrsa_attend_quote +for each row +begin +select hrsa_attend_quote_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_attend_quote_data( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) DEFAULT 0, + attend_quote_id NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_attend_quote_data_value( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) DEFAULT 0, + attend_quote_id NUMBER(38,0) DEFAULT 0, + attend_quote_data_id NUMBER(38,0) NOT NULL, + attend_quote_field_id NUMBER(38,0) NOT NULL, + data_value varchar2(250) NOT NULL, + create_time date DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +create sequence hrsa_attend_quote_d_v_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_attend_quote_d_v_Tri +before insert on hrsa_attend_quote_data_value +for each row +begin +select hrsa_attend_quote_d_v_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_attend_quote_field( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + field_name varchar2(100) DEFAULT '' , + source_type number DEFAULT 0, + field_type number DEFAULT 0, + enable_status number DEFAULT 0, + code varchar2(50) DEFAULT '' , + description varchar2(100) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +create sequence hrsa_attend_quote_field_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_attend_quote_field_Tri +before insert on hrsa_attend_quote_field +for each row +begin +select hrsa_attend_quote_field_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_attend_quote_sync_set( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + source_type number DEFAULT 0, + current_setting_content varchar2(4000) DEFAULT '', + default_setting_content varchar2(4000) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +create sequence hrsa_attend_quote_sync_set_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_attend_quote_sync_set_Tri +before insert on hrsa_attend_quote_sync_set +for each row +begin +select hrsa_attend_quote_sync_set_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_bill_batch( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + bill_month varchar2(30) NOT NULL, + bill_status number NOT NULL, + social_num number DEFAULT 0, + fund_num number DEFAULT 0 , + other_num number DEFAULT 0 , + social_pay varchar2(4000) NULL, + fund_pay varchar2(4000) NULL, + other_pay varchar2(4000) NULL, + accountant varchar2(200) NOT NULL, + remarks varchar2(60) NULL, + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' + ); +/ + +create sequence hrsa_bill_batch_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_bill_batch_Tri +before insert on hrsa_bill_batch +for each row +begin +select hrsa_bill_batch_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_bill_batch_encdata( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + tablename varchar2(50) NOT NULL, + fieldname varchar2(50) NOT NULL, + enc_value varchar2(4000) NOT NULL, + skey varchar2(4000) NOT NULL, + crc varchar2(4000) NULL, + creater NUMBER(38,0) NULL, + created varchar2(50) NULL, + MODIFIER NUMBER(38,0) NULL, + modified varchar2(50) NULL, + tenant_key varchar2(10) NULL + ); +/ + +CREATE sequence hrsa_bill_batch_encdata_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_bill_batch_encdata_Tri +before insert on hrsa_bill_batch_encdata +for each row +begin +select hrsa_bill_batch_encdata_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_bill_detail( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + bill_month varchar2(30) NOT NULL, + bill_status number NOT NULL, + payment_status number NOT NULL, + supplementary_month varchar2(50) NULL, + supplementary_projects varchar2(50) NULL, + resource_from number NOT NULL, + social_pay_org number NULL, + social_account varchar2(50) NULL, + social_scheme_id NUMBER(38,0) NULL, + social_payment_base_string varchar2(512) NULL, + fund_pay_org number NULL, + fund_account varchar2(50) NULL, + supplement_fund_account varchar2(50) NULL, + fund_scheme_id number NULL, + fund_payment_base_string varchar2(512) NULL, + other_pay_org number NULL, + other_scheme_id NUMBER(38,0) NULL, + other_payment_base_string varchar2(512) NULL, + social_per_json varchar2(512) NULL, + social_per_sum varchar2(512) NULL, + fund_per_json varchar2(512) NULL, + fund_per_sum varchar2(512) NULL, + other_per_json varchar2(512) NULL, + other_per_sum varchar2(512) NULL, + per_sum varchar2(512) NULL, + social_com_json varchar2(512) NULL, + social_com_sum varchar2(512) NULL, + fund_com_json varchar2(512) NULL, + fund_com_sum varchar2(512) NULL, + other_com_json varchar2(512) NULL, + other_com_sum varchar2(512) NULL, + com_sum varchar2(512) NULL, + social_sum varchar2(512) NULL, + fund_sum varchar2(512) NULL, + other_sum varchar2(512) NULL, + total varchar2(512) NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL + ); +/ + +CREATE sequence hrsa_bill_detail_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_bill_detail_Tri +before insert on hrsa_bill_detail +for each row +begin +select hrsa_bill_detail_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_bill_detail_temp( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + bill_month varchar2(30) NOT NULL, + bill_status number NOT NULL, + payment_status number NOT NULL, + supplementary_month varchar2(50) NULL, + supplementary_projects varchar2(50) NULL, + resource_from number NOT NULL, + social_pay_org number NULL, + social_account varchar2(50) NULL, + social_scheme_id NUMBER(38,0) NULL, + social_payment_base_string varchar2(512) NULL, + fund_pay_org number NULL, + fund_account varchar2(50) NULL, + supplement_fund_account varchar2(50) NULL, + fund_scheme_id NUMBER(38,0) NULL, + fund_payment_base_string varchar2(512) NULL, + other_pay_org number NULL, + other_scheme_id number NULL, + other_payment_base_string varchar2(512) NULL, + social_per_json varchar2(512) NULL, + social_per_sum varchar2(512) NULL, + fund_per_json varchar2(512) NULL, + fund_per_sum varchar2(512) NULL, + other_per_json varchar2(512) NULL, + other_per_sum varchar2(512) NULL, + per_sum varchar2(512) NULL, + social_com_json varchar2(512) NULL, + social_com_sum varchar2(512) NULL, + fund_com_json varchar2(512) NULL, + fund_com_sum varchar2(512) NULL, + other_com_json varchar2(512) NULL, + other_com_sum varchar2(512) NULL, + com_sum varchar2(512) NULL, + social_sum varchar2(512) NULL, + fund_sum varchar2(512) NULL, + other_sum varchar2(512) NULL, + total varchar2(512) NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL +); +/ + +CREATE sequence hrsa_bill_detail_temp_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_bill_detail_temp_Tri +before insert on hrsa_bill_detail_temp +for each row +begin +select hrsa_bill_detail_temp_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_bill_inspect( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + bill_month varchar2(30) NOT NULL, + payment_status number NOT NULL, + supplementary_month varchar2(50) NULL, + supplementary_projects varchar2(50) NULL, + inspect_status number NOT NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL + +); +/ + +CREATE sequence hrsa_bill_inspect_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_bill_inspect_Tri +before insert on hrsa_bill_inspect +for each row +begin +select hrsa_bill_inspect_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_check_result( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_acct_record_id NUMBER(38,0) NOT NULL, + salary_check_rule_id NUMBER(38,0) NOT NULL, + formula_id NUMBER(38,0) NOT NULL, + ignore_type number NOT NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL + ); +/ + +CREATE sequence hrsa_check_result_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_check_result_Tri +before insert on hrsa_check_result +for each row +begin +select hrsa_check_result_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_check_result_record( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_acct_record_id NUMBER(38,0) NOT NULL, + salary_check_rule_id NUMBER(38,0) NOT NULL, + formula_id NUMBER(38,0) NOT NULL, + check_result_id NUMBER(38,0) NOT NULL, + salary_acct_emp_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL + ); +/ + +CREATE sequence hrsa_check_result_record_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_check_result_record_Tri +before insert on hrsa_check_result_record +for each row +begin +select hrsa_check_result_record_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_ck_result_detail_temp( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_acct_emp_id NUMBER(38,0) NOT NULL, + salary_acct_record_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + salary_check_rule_id NUMBER(38,0) NOT NULL, + formula_id NUMBER(38,0) NOT NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL, + calculate_key varchar2(50) NOT NULL +); +/ + +CREATE sequence hrsa_ck_result_detail_temp_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_ck_result_detail_temp_Tri +before insert on hrsa_ck_result_detail_temp +for each row +begin +select hrsa_ck_result_detail_temp_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_excel_acct_result( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) NOT NULL, + salary_acct_emp_id NUMBER(38,0) NOT NULL, + salary_acct_record_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + salary_item_id NUMBER(38,0) NOT NULL, + result_value varchar2(1000) NOT NULL, + creator NUMBER(38,0) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL + ); +/ + +CREATE sequence hrsa_excel_acct_result_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_excel_acct_result_Tri +before insert on hrsa_excel_acct_result +for each row +begin +select hrsa_excel_acct_result_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_formula( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(255) NOT NULL, + description varchar2(255) NULL , + module varchar2(255) NOT NULL, + use_for varchar2(255) NULL , + reference_type varchar2(255) NULL , + return_type varchar2(255) NOT NULL, + validate_type varchar2(255) NOT NULL, + extend_param varchar2(255) NULL , + formula varchar2(4000) NOT NULL, + formulaRunScript varchar2(4000) NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + create_time date NOT NULL, + update_time date NOT NULL + ); +/ + +CREATE TABLE hrsa_formula_var( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(255) NOT NULL, + formula_id NUMBER(38,0) NOT NULL, + field_id varchar2(255) NOT NULL, + field_name varchar2(500) NOT NULL, + field_type varchar2(255) NOT NULL, + source varchar2(255) NOT NULL, + order_index number NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + create_time date NOT NULL, + update_time date NOT NULL +); +/ + +CREATE TABLE hrsa_fund_archives( + id number PRIMARY KEY NOT NULL, + employee_id number NOT NULL, + non_payment number NULL, + welfare_type number NOT NULL, + fund_start_time varchar2(20) NULL, + fund_end_time varchar2(20) NULL, + fund_scheme_id number NULL, + fund_account varchar2(50) NULL, + supplement_fund_account varchar2(50) NULL, + payment_organization number NULL, + under_take number NULL, + fund_payment_base_string varchar2(4000) NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator number NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_fund_archives_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_fund_archives_Tri +before insert on hrsa_fund_archives +for each row +begin +select hrsa_fund_archives_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_insurance_category( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + insurance_name varchar2(50) NOT NULL, + welfare_type number NOT NULL, + is_use number DEFAULT 1, + payment_scope varchar2(10) NULL, + data_type number DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_other_archives( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + non_payment number NULL, + welfare_type number NOT NULL, + other_start_time varchar2(20) NULL, + other_end_time varchar2(20) NULL, + other_scheme_id NUMBER(38,0) NULL, + payment_organization number NULL, + under_take number NULL, + other_payment_base_string varchar2(4000) NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' + ); +/ + +CREATE sequence hrsa_other_archives_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_other_archives_Tri +before insert on hrsa_other_archives +for each row +begin +select hrsa_other_archives_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_other_deduction( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + declare_month date DEFAULT sysdate, + business_healthy_insurance varchar2(255) DEFAULT '0.00000', + tax_delay_endowment_insurance varchar2(255) DEFAULT '', + other_deduction varchar2(255) DEFAULT '', + deduction_allowed_donation varchar2(255) DEFAULT '', + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' + ); +/ + +CREATE sequence hrsa_other_deduction_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_other_deduction_Tri +before insert on hrsa_other_deduction +for each row +begin +select hrsa_other_deduction_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_acct_emp( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_acct_record_id NUMBER(38,0) DEFAULT 0, + salary_sob_id NUMBER(38,0) DEFAULT 0, + employee_id NUMBER(38,0) DEFAULT 0, + tax_agent_id NUMBER(38,0) DEFAULT 0, + salary_month DATE DEFAULT to_date('1900-01-01','YYYY-DD-mm'), + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' + ); +/ + +CREATE sequence hrsa_salary_acct_emp_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_acct_emp_Tri +before insert on hrsa_salary_acct_emp +for each row +begin +select hrsa_salary_acct_emp_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_acct_record( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_month DATE DEFAULT to_date('1900-01-01','YYYY-DD-mm'), + tax_cycle DATE DEFAULT to_date('1900-01-01','YYYY-DD-mm'), + salary_sob_id NUMBER(38,0) DEFAULT 0, + status number DEFAULT 1, + acct_times number DEFAULT 0, + description varchar2(100) DEFAULT '', + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_acct_record_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_acct_record_Tri +before insert on hrsa_salary_acct_record +for each row +begin +select hrsa_salary_acct_record_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_acct_result( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) DEFAULT 0, + salary_acct_emp_id NUMBER(38,0) DEFAULT 0, + salary_acct_record_id NUMBER(38,0) DEFAULT 0, + employee_id NUMBER(38,0) DEFAULT 0, + tax_agent_id NUMBER(38,0) DEFAULT 0, + salary_item_id NUMBER(38,0) DEFAULT 0, + result_value varchar2(1000) DEFAULT '' , + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_acct_result_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_acct_result_Tri +before insert on hrsa_salary_acct_result +for each row +begin +select hrsa_salary_acct_result_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_archive( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' + ); +/ + +CREATE TABLE hrsa_salary_archive_dimission( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + dimission_time_interval varchar2(20) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL + ); +/ + +CREATE sequence hrsa_salary_archive_d_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_archive_d_Tri +before insert on hrsa_salary_archive_dimission +for each row +begin +select hrsa_salary_archive_d_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_archive_item( + id NUMBER(38,0) NOT NULL, + salary_archive_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) DEFAULT 0, + effective_time DATE DEFAULT sysdate, + adjust_reason varchar2(100) DEFAULT '', + salary_item_id NUMBER(38,0) DEFAULT 0, + item_value varchar2(200) DEFAULT '' , + description varchar2(200) DEFAULT '' , + operator NUMBER(38,0) DEFAULT 0, + operate_time date NULL , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_archive_item_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hhrsa_salary_archive_item_Tri +before insert on hrsa_salary_archive_item +for each row +begin +select hrsa_salary_archive_item_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_archive_tax_agent( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_archive_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) DEFAULT 0, + effective_time DATE DEFAULT sysdate, + adjust_reason varchar2(100) DEFAULT '' , + tax_agent_id NUMBER(38,0) DEFAULT 0, + operator NUMBER(38,0) DEFAULT 0, + operate_time date NULL , + description varchar2(200) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_archive_tax_a_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_archive_tax_a_Tri +before insert on hrsa_salary_archive_tax_agent +for each row +begin +select hrsa_salary_archive_tax_a_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_item( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(100) DEFAULT '' , + code varchar2(100) DEFAULT '' , + system_type number DEFAULT 0, + sys_salary_item_id NUMBER(38,0) DEFAULT 0, + category number DEFAULT 7 , + item_type number DEFAULT 1 , + use_default number DEFAULT 0, + use_in_employee_salary number DEFAULT 0, + rounding_mode number DEFAULT 1 , + pattern number DEFAULT 5 , + value_type number DEFAULT 1 , + datasource number DEFAULT 0, + formula_id NUMBER(38,0) DEFAULT 0, + description varchar2(1000) DEFAULT '', + can_edit number DEFAULT 1 , + can_delete number DEFAULT 1 , + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + data_type varchar2(20) NOT NULL +); +/ + +CREATE TABLE hrsa_salary_send( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_month date NOT NULL, + salary_accounting_id NUMBER(38,0) DEFAULT 0, + salary_sob_id NUMBER(38,0) NOT NULL, + send_num number DEFAULT 0, + send_total number DEFAULT 0, + last_send_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_send_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_send_Tri +before insert on hrsa_salary_send +for each row +begin +select hrsa_salary_send_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_send_info( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_send_id NUMBER(38,0) NOT NULL, + salary_month date NOT NULL, + salary_acct_record_id NUMBER(38,0) DEFAULT 0, + tax_agent_id NUMBER(38,0) DEFAULT 0, + employee_id NUMBER(38,0) DEFAULT 0, + send_status number DEFAULT 0, + send_time DATE , + salary_template clob NULL, + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_salary_sob( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(100) DEFAULT '' , + income_category number DEFAULT 1 , + salary_cycle_type number DEFAULT 3 , + salary_cycle_from_day number DEFAULT 1 , + tax_cycle_type number DEFAULT 3 , + attend_cycle_type number DEFAULT 3 , + attend_cycle_from_day number DEFAULT 1 , + social_security_cycle_type number DEFAULT 3 , + disable number DEFAULT 0, + description varchar2(1000) DEFAULT '', + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_sob_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_Tri +before insert on hrsa_salary_sob +for each row +begin +select hrsa_salary_sob_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_sob_adjust_rule( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) NOT NULL, + salary_item_id NUMBER(38,0) NOT NULL, + day_of_month number DEFAULT 0, + before_adjustment_type number DEFAULT 1 , + after_adjustment_type number DEFAULT 1 , + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_sob_a_r_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_a_r_Tri +before insert on hrsa_salary_sob_adjust_rule +for each row +begin +select hrsa_salary_sob_a_r_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_sob_check_rule( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) NOT NULL, + name varchar2(100) NOT NULL, + formula_id NUMBER(38,0) NOT NULL, + description varchar2(1000) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL +); +/ + +CREATE sequence hrsa_salary_sob_c_r_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_c_r_Tri +before insert on hrsa_salary_sob_check_rule +for each row +begin +select hrsa_salary_sob_c_r_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_sob_default_item( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + income_category number DEFAULT 1 , + sys_salary_item_id NUMBER(38,0) DEFAULT 0, + can_edit number DEFAULT 1 , + can_delete number DEFAULT 1 , + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '', + sob_default_item_group_id NUMBER(38,0) NOT NULL, + sorted_index number NOT NULL +); +/ + +CREATE sequence hrsa_salary_sob_d_i_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_d_i_Tri +before insert on hrsa_salary_sob_default_item +for each row +begin +select hrsa_salary_sob_d_i_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_sob_emp_field( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) DEFAULT 0, + field_code varchar2(100) DEFAULT '' , + sorted_index number DEFAULT 0, + can_delete number DEFAULT 1 , + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_sob_emp_field_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_emp_field_Tri +before insert on hrsa_salary_sob_emp_field +for each row +begin +select hrsa_salary_sob_emp_field_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_sob_item( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) NOT NULL, + salary_item_id NUMBER(38,0) NOT NULL, + salary_sob_item_group_id NUMBER(38,0) NOT NULL, + formula_id NUMBER(38,0) NOT NULL, + sorted_index number NOT NULL, + description varchar2(1000) DEFAULT '' , + create_time date NOT NULL, + update_time date NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL +); +/ + +CREATE sequence hrsa_salary_sob_item_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_item_Tri +before insert on hrsa_salary_sob_item +for each row +begin +select hrsa_salary_sob_item_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_sob_item_group( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) NOT NULL, + name varchar2(100) NOT NULL, + sorted_index number NOT NULL, + description varchar2(1000) DEFAULT '', + create_time date NOT NULL, + update_time date NOT NULL, + creator NUMBER(38,0) NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL +); +/ + +CREATE TABLE hrsa_salary_sob_range( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) DEFAULT 0, + target_type number DEFAULT 1 , + target_id NUMBER(38,0) DEFAULT 0, + employee_status number DEFAULT 0, + include_type number DEFAULT 1 , + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_sob_range_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_sob_range_Tri +before insert on hrsa_salary_sob_range +for each row +begin +select hrsa_salary_sob_range_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_salary_template +( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(100) DEFAULT '', + salary_sob_id NUMBER(38,0) NOT NULL, + use_type number DEFAULT 0, + description varchar2(100) DEFAULT '', + email_status number DEFAULT 0, + send_email_id NUMBER(38,0) DEFAULT 0, + msg_status number DEFAULT 0, + theme varchar2(100) DEFAULT '', + background varchar2(2000) DEFAULT '', + text_content varchar2(100) DEFAULT '', + text_content_position number DEFAULT 0, + salary_item_null_status number DEFAULT 0, + salary_item_zero_status number DEFAULT 0, + salary_item_setting clob NOT NULL, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_salary_template_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_salary_template_Tri +before insert on hrsa_salary_template +for each row +begin +select hrsa_salary_template_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_scheme_detail( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + insurance_id NUMBER(38,0) NOT NULL, + primary_id NUMBER(38,0) NOT NULL, + effective_time varchar2(20) NULL, + expiration_time varchar2(20) NULL, + is_payment number DEFAULT 1 , + payment_scope number NOT NULL, + upper_limit varchar2(1024) NULL, + lower_limit varchar2(1024) NULL, + payment_proportion varchar2(1024) NULL, + fixed_cost varchar2(1024) NULL, + valid_num number DEFAULT 2 , + rentention_rule number NULL, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_scheme_detail_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_scheme_detail_Tri +before insert on hrsa_scheme_detail +for each row +begin +select hrsa_scheme_detail_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_sob_default_emp_field( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + field_code varchar2(30) DEFAULT '' , + sorted_index number DEFAULT 0, + can_delete number DEFAULT 0, + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_sob_default_item_group( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + income_category number DEFAULT 1 , + name varchar2(100) DEFAULT '', + sorted_index number DEFAULT 0, + description varchar2(1000) DEFAULT '', + create_time date NOT NULL, + update_time date NOT NULL, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_social_archives( + id number PRIMARY KEY NOT NULL, + employee_id number NOT NULL, + non_payment number NULL, + welfare_type number NOT NULL, + social_start_time varchar2(20) NULL, + social_end_time varchar2(20) NULL, + social_scheme_id number NULL, + social_account varchar2(50) NULL, + payment_organization number NULL, + under_take number NULL, + social_payment_base_string varchar2(4000) NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator number NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_social_archives_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_social_archives_Tri +before insert on hrsa_social_archives +for each row +begin +select hrsa_social_archives_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_social_archives_encdata( + id number PRIMARY KEY NOT NULL, + tablename varchar2(50) NOT NULL, + fieldname varchar2(50) NOT NULL, + enc_value varchar2(4000) NOT NULL, + skey varchar2(4000) NOT NULL, + crc varchar2(4000) NULL, + creater number NULL, + created varchar2(50) NULL, + MODIFIER number NULL, + modified varchar2(50) NULL, + tenant_key varchar2(10) NULL +); +/ + +CREATE sequence hrsa_social_a_e_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_social_a_e_Tri +before insert on hrsa_social_archives_encdata +for each row +begin +select hrsa_social_a_e_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_social_security_scheme( + id number PRIMARY KEY NOT NULL, + payment_area varchar2(100) NOT NULL, + payment_type number DEFAULT 1 , + scheme_name varchar2(100) NOT NULL, + welfare_type number NOT NULL, + is_use number DEFAULT 1 , + remarks varchar2(30) DEFAULT '', + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator number DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_social_s_s_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_social_s_s_Tri +before insert on hrsa_social_security_scheme +for each row +begin +select hrsa_social_s_s_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_sys_salary_item( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(100) DEFAULT '', + code varchar2(100) DEFAULT '', + system_type number DEFAULT 0, + category number DEFAULT 7 , + item_type number DEFAULT 1 , + use_default number DEFAULT 0, + use_in_employee_salary number DEFAULT 0, + rounding_mode number DEFAULT 1 , + pattern number DEFAULT 5 , + value_type number DEFAULT 1 , + datasource number DEFAULT 0, + formula_id NUMBER(38,0) DEFAULT 0, + description varchar2(1000) DEFAULT '', + can_edit number DEFAULT 1 , + can_delete number DEFAULT 1 , + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '', + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + data_type varchar2(20) NOT NULL +); +/ + +CREATE TABLE hrsa_sys_tax_rate_base( + id number PRIMARY KEY NOT NULL, + name varchar2(100) NOT NULL, + system_type number NOT NULL, + description varchar2(100) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator number NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL +); +/ + +CREATE sequence hrsa_sys_tax_rate_base_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_sys_tax_rate_base_Tri +before insert on hrsa_sys_tax_rate_base +for each row +begin +select hrsa_sys_tax_rate_base_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_sys_tax_rate_detail( + id number PRIMARY KEY NOT NULL, + base_id number NOT NULL, + index_num number NOT NULL, + income_lower_limit number(15, 5) NULL, + income_upper_limit number(15, 5) NULL, + duty_free_value number(15, 5) NULL, + duty_free_rate number(15, 5) NULL, + taxable_income_ll number(15, 5) NULL, + taxable_income_ul number(15, 5) NOT NULL, + tax_rate number(15, 5) NOT NULL, + tax_deduction number(15, 5) NOT NULL, + create_time date NOT NULL, + update_time date NOT NULL, + creator number NOT NULL, + delete_type number DEFAULT 0, + tenant_key varchar2(10) NOT NULL +); +/ + +CREATE sequence hrsa_sys_tax_rate_detail_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_sys_tax_rate_detail_Tri +before insert on hrsa_sys_tax_rate_detail +for each row +begin +select hrsa_sys_tax_rate_detail_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_tax_agent( + id number PRIMARY KEY NOT NULL, + name varchar2(100) DEFAULT '', + description varchar2(100) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator number DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_tax_agent_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_tax_agent_Tri +before insert on hrsa_tax_agent +for each row +begin +select hrsa_tax_agent_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_tax_declaration( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_month date DEFAULT to_date('1900-01-01','YYYY-DD-mm'), + tax_cycle date DEFAULT to_date('1900-01-01','YYYY-DD-mm'), + tax_agent_id number DEFAULT 0, + description varchar2(1000) DEFAULT '', + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_tax_declaration_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_tax_declaration_Tri +before insert on hrsa_tax_declaration +for each row +begin +select hrsa_tax_declaration_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_tax_declaration_detail( + id NUMBER(38,0) NOT NULL, + tax_declaration_id NUMBER(38,0) DEFAULT 0, + employee_id NUMBER(38,0) DEFAULT 0, + field_code varchar2(100) DEFAULT '' , + field_value varchar2(1000) DEFAULT '' , + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_tax_rate_base( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + name varchar2(100) DEFAULT '' , + system_type number DEFAULT 0, + description varchar2(100) DEFAULT '' , + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_tax_rate_base_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_tax_rate_base_Tri +before insert on hrsa_tax_rate_base +for each row +begin +select hrsa_tax_rate_base_id.nextval into :new.id from dual; +end; +/ + +CREATE TABLE hrsa_tax_rate_detail( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + base_id NUMBER(38,0) DEFAULT 0, + index_num number DEFAULT 0, + income_upper_limit number(15, 5) DEFAULT 0.00000, + income_lower_limit number(15, 5) DEFAULT 0.00000, + duty_free_value number(15, 5) DEFAULT 0.00000, + duty_free_rate number(15, 5) DEFAULT 0.00000, + taxable_income_ul number(15, 5) DEFAULT 0.00000, + taxable_income_ll number(15, 5) DEFAULT 0.00000, + tax_rate number(15, 5) DEFAULT 0.00000, + tax_deduction number(15, 5) DEFAULT 0.00000, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE sequence hrsa_tax_rate_detail_id +start with 1 +increment by 1 +nomaxvalue +nocycle; +/ + +create or replace trigger hrsa_tax_rate_detail_Tri +before insert on hrsa_tax_rate_detail +for each row +begin +select hrsa_tax_rate_detail_id.nextval into :new.id from dual; +end; +/ + +ALTER TABLE hrsa_salary_sob_item ADD can_delete number NULL; +/ + +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214787, 'нϼ', 'wagesTotal', 1, 5, 22, 1, 0, 2, 2, 2, 1, 1651736817711, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214788, 'ȫһԽϼ', 'annualBonusTotal', 1, 5, 22, 0, 0, 2, 2, 2, 1, 1651737358294, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:07','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214789, '˰ǰۿϼ', 'preTaxDeductionsTotal', 1, 5, 22, 1, 0, 2, 2, 2, 1, 1651737635353, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:22','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214790, '£ΣӦ˰ϼ', 'income', 1, 5, 22, 1, 0, 2, 2, 2, 0, 1651737859216, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:25','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214791, 'ǰۼӦ˰ϼ', 'addUpIncome', 1, 5, 22, 1, 0, 2, 2, 2, 0, 1651738034028, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:28','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214792, 'ϸ', 'endowmentInsurance', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651749914746, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214793, 'ҽƸ', 'medicalInsurance', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651749958879, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214795, 'ʧҵ', 'unemploymentInsurance', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651750005281, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214796, '', 'housingProvidentFund', 1, 2, 10, 1, 0, 2, 2, 2, 7, 1651750034689, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214797, '£Σר۳ϼ', 'specialDeduction', 1, 5, 22, 1, 0, 2, 2, 2, 7, 1651738826550, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:40','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214798, 'ǰۼר۳ϼ', 'addUpSpecialDeduction', 1, 5, 22, 1, 0, 2, 2, 2, 7, 1651739000845, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214799, 'ۼŮ', 'addUpChildEducation', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739053212, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214800, 'ۼסϢ', 'addUpHousingLoannumbererest', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739100651, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214801, 'ۼס', 'addUpHousingRent', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739151122, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214802, 'ۼƼ', 'addUpContinuingEducation', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739212437, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214803, 'ۼ', 'addUpSupportElderly', 1, 2, 11, 1, 0, 2, 2, 2, 6, 1651739310959, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214804, 'ǰۼרӿ۳ϼ', 'addUpSpeAddiDeduction', 1, 5, 22, 1, 0, 2, 2, 2, 6, 1651739411365, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214805, '£Σ۳ϼ', 'otherDeduction', 1, 5, 22, 0, 0, 2, 2, 2, 8, 1651739815651, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214806, 'ǰۼ۳ϼ', 'addUpOtherDeduction', 1, 5, 22, 0, 0, 2, 2, 2, 5, 1651740238860, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214807, '£Σ', 'subtraction', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651740311026, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:56:11','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214808, 'ǰۼƼ', 'addUpSubtraction', 1, 5, 22, 1, 0, 2, 2, 2, 5, 1651740397225, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214809, '£Σн˰˰', 'taxRate', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651742185837, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214810, '£Σн˰۳', 'quickDeductionFactor', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651742702735, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214811, 'ǰۼӦ˰ö', 'addUpTaxableIncome', 1, 5, 22, 1, 0, 2, 2, 2, 5, 1651745445982, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:04:12','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214812, 'ǰۼӦ˰', 'addUpTaxPayable', 1, 7, 19, 1, 0, 2, 2, 2, 1, 1651748888864, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:04:14','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214813, 'ǰۼѿ۽˰ϼ', 'addUpAdvanceTax', 1, 5, 22, 1, 0, 2, 2, 2, 5, 1651748978482, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:04:18','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214814, '£ΣӦ˰', 'refundedOrSupplementedTax', 1, 6, 16, 1, 0, 2, 2, 2, 1, 1651749111981,' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674853617092214815, '£Σʵнʺϼ', 'netSalaryTotal', 1, 5, 22, 1, 0, 2, 2, 2, 1, 1651749240004, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:04:24','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674861648655892480, '', 'baseSalary', 1, 1, 1, 1, 1, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:57:46','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674861768948531201, 'λ', 'postSalary', 1, 1, 1, 1, 1, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:57:57','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674861880508628992, 'ڿۿ', 'attendanceDeduction', 1, 2, 9, 1, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:58:04','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093121, '˰ϼ', 'afterTaxReimbursementTotal', 1, 5, 22, 0, 0, 3, 2, 1, 1, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:58:06','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093122, '', 'annuity', 1, 2, 12, 0, 0, 2, 2, 2, 7, 1651749398360, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093123, 'ҵ', 'commercialHealthInsurance', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1651749448800, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093124, '˰ϱ', 'taxDeferredEndowmentInsurance', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1651749487187, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093125, 'Ʋԭֵ', 'originalValueOfProperty', 1, 2, 12, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:58:29','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093126, '۳˰', 'deductedTax', 1, 2, 12, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:58:42','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093127, '', 'other', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1651749540147, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093128, '£Σ', 'fee', 1, 7, 19, 0, 0, 2, 2, 1, 0, 0, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093129, '£Σ˰', 'taxFreeIncome', 1, 7, 19, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:58:54','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674914626953093130, '˰', 'lessTaxProportion', 1, 7, 19, 0, 0, 2, 2, 1, 0, 0, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646657, '˰ϼ', 'afterTaxAdjustmentTotal', 1, 5, 22, 0, 0, 2, 2, 1, 1, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:59:09','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646658, 'ǰۼƼ˰ϼ', 'addUpTaxDeduction', 1, 5, 22, 0, 0, 2, 2, 1, 5, 0, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646659, '£Σ׼ʿ۳ľ', 'allowedDonation', 1, 5, 22, 0, 0, 2, 2, 2, 8, 1651749595061, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646660, 'ǰۼ׼۳ľ', 'addUpAllowedDonation', 1, 5, 22, 0, 0, 2, 2, 2, 5, 1651749675268, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 15:54:31','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646661, '£Σ˰', 'taxDeduction', 1, 5, 22, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:00:25','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674916065864646662, '˰ۿϼ', 'afterTaxDeductionsTotal', 1, 5, 22, 0, 0, 2, 2, 1, 1, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:00:37','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674919424520683521, '˰ۿ', 'afterTaxDeductions', 1, 4, 15, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:00:39','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674919682288984064, '˰', 'afterTaxReimbursement', 1, 3, 13, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:00:40','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674919776783499264, '˰', 'afterTaxAdjustment', 1, 3, 14, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:00:48','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (674920588574261248, 'ս', 'annualBonus', 1, 1, 2, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:33:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:00:51','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (697532371614588928, 'ǰۼ籣˺ϼ', 'addUpSocialSecurityTotal', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1651801433504, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-07 10:22:55','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:44:23','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (697532667749400576, 'ǰۼƹ˺ϼ', 'addUpAccumulationFundTotal', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1651801586972, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-07 10:22:55','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:46:40','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ +INSERT into hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (697536344384012289, 'ǰۼҵְҵ˺ϼ', 'addUpEnterpriseAndOther', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1651801667770, ' ', 0, 1, 0, 0, 'all_teams', to_date('2022-03-07 10:22:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:48:07','yyyy-MM-dd HH24:mi:ss'), 'number') +; +/ + + + + + +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651736817711, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.}+{нĿ.λ}', 'salaryItem_baseSalary+salaryItem_postSalary', 1, 0, to_date('2022-05-05 15:46:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 15:46:58','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651737358294, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ս}', 'salaryItem_annualBonus', 1, 0, to_date('2022-05-05 15:55:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 15:55:58','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651737635353, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ڿۿ}', 'salaryItem_attendanceDeduction', 1, 0, to_date('2022-05-05 16:00:35','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:00:35','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651737859216, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.нϼ}+{нĿ.ȫһԽϼ}-{нĿ.˰ǰۿϼ}', 'salaryItem_wagesTotal+salaryItem_annualBonusTotal-salaryItem_preTaxDeductionsTotal', 1, 0, to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651738034028, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£ΣӦ˰ϼ}+{ۼ.ۼ}', 'salaryItem_income+addUpSituation_addUpIncome', 1, 0, to_date('2022-05-05 16:07:14','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:07:14','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749914746, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.ϱո}', 'welfare_9001socialPer', 1, 0, to_date('2022-05-05 19:25:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:25:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749958879, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.ҽƱո}', 'welfare_9002socialPer', 1, 0, to_date('2022-05-05 19:25:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:25:59','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651750005281, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.ʧҵո}', 'welfare_9004socialPer', 1, 0, to_date('2022-05-05 19:26:45','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:26:45','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651750034689, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.ס}', 'welfare_9006fundPer', 1, 0, to_date('2022-05-05 19:27:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:27:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651738826550, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ϸ}+{нĿ.ҽƸ}+{нĿ.ʧҵ}+{нĿ.}', 'salaryItem_endowmentInsurance+salaryItem_medicalInsurance+salaryItem_unemploymentInsurance+salaryItem_housingProvidentFund', 1, 0, to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739000845, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£Σר۳ϼ}+{ۼ.ۼ籣˺ϼ}+{ۼ.ۼƹ˺ϼ}', 'salaryItem_specialDeduction+addUpSituation_addUpSocialSecurityTotal+addUpSituation_addUpAccumulationFundTotal', 1, 0, to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739053212, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼŮ}', 'addUpDeductions_addUpChildEducation', 1, 0, to_date('2022-05-05 16:24:13','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:24:13','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739100651, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼ.ۼסϢ}', 'addUpSituation_addUpHousingLoannumbererest', 1, 0, to_date('2022-05-05 16:25:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:25:01','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739151122, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼ.ۼס}', 'addUpSituation_addUpHousingRent', 1, 0, to_date('2022-05-05 16:25:51','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:25:51','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739212437, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼ.ۼƼ}', 'addUpSituation_addUpContinuingEducation', 1, 0, to_date('2022-05-05 16:26:52','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:26:52','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739310959, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼ.ۼ}', 'addUpSituation_addUpSupportElderly', 1, 0, to_date('2022-05-05 16:28:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:28:31','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739411365, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ۼŮ}+{нĿ.ۼסϢ}+{нĿ.ۼס}+{нĿ.ۼƼ}+{нĿ.ۼ}', 'salaryItem_addUpChildEducation+salaryItem_addUpHousingLoannumbererest+salaryItem_addUpHousingRent+salaryItem_addUpContinuingEducation+salaryItem_addUpSupportElderly', 1, 0, to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651739815651, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.}+{нĿ.ҵ}+{нĿ.˰ϱ}+{нĿ.Ʋԭֵ}+{нĿ.۳˰}+{нĿ.}', 'salaryItem_annuity+salaryItem_commercialHealthInsurance+salaryItem_taxDeferredEndowmentInsurance+salaryItem_originalValueOfProperty+salaryItem_deductedTax+salaryItem_other', 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651740238860, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£Σ۳ϼ}+{ۼ.ۼ˰۳}+{ۼ.ۼҵְҵ}', 'salaryItem_otherDeduction+addUpSituation_addUpOtherDeduction+addUpSituation_addUpEnterpriseAndOther', 1, 0, to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651740311026, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '5000', '5000', 1, 0, to_date('2022-05-05 16:45:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:45:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651740397225, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£Σ}+{ۼ.ۼƼ}', 'salaryItem_subtraction+addUpSituation_addUpSubtraction', 1, 0, to_date('2022-05-05 16:46:37','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:46:37','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type,extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651742185837, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({нĿ.ǰۼӦ˰ö}<=0){0;}else if({нĿ.ǰۼӦ˰ö}<=36000){0.03;}else if({нĿ.ǰۼӦ˰ö}<=144000){0.1;}else if({нĿ.ǰۼӦ˰ö}<=300000){0.2;}else if({нĿ.ǰۼӦ˰ö}<=420000){0.25;}else if({нĿ.ǰۼӦ˰ö}<=660000){0.3;}else if({нĿ.ǰۼӦ˰ö}<=960000){0.35;}else{0.45;}', 'if(salaryItem_addUpTaxableIncome<=0){0;}else if(salaryItem_addUpTaxableIncome<=36000){0.03;}else if(salaryItem_addUpTaxableIncome<=144000){0.1;}else if(salaryItem_addUpTaxableIncome<=300000){0.2;}else if(salaryItem_addUpTaxableIncome<=420000){0.25;}else if(salaryItem_addUpTaxableIncome<=660000){0.3;}else if(salaryItem_addUpTaxableIncome<=960000){0.35;}else{0.45;}', 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651742702735, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({нĿ.ǰۼӦ˰ö}<=36000){{нĿ.ǰۼӦ˰ö}<=36000){0;}else if({нĿ.ǰۼӦ˰ö}<=144000){2520;}else if({нĿ.ǰۼӦ˰ö}<=300000){16920;}else if({нĿ.ǰۼӦ˰ö}<=420000){31920;}else if({нĿ.ǰۼӦ˰ö}<=660000){52920;}else if({нĿ.ǰۼӦ˰ö}<=960000){85920;}else{181920;}', 'if(salaryItem_addUpTaxableIncome<=36000){0;}else if(salaryItem_addUpTaxableIncome<=144000){2520;}else if(salaryItem_addUpTaxableIncome<=300000){16920;}else if(salaryItem_addUpTaxableIncome<=420000){31920;}else if(salaryItem_addUpTaxableIncome<=660000){52920;}else if(salaryItem_addUpTaxableIncome<=960000){85920;}else{181920;}', 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651745445982, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ǰۼӦ˰ϼ}-{нĿ.ǰۼר۳ϼ}-{нĿ.ǰۼרӿ۳ϼ}-{нĿ.ǰۼ۳ϼ}-{нĿ.ǰۼƼ}-{нĿ.ǰۼ׼۳ľ}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation', 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651748888864, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ǰۼӦ˰ö}*{нĿ.£Σн˰˰}-{нĿ.£Σн˰۳}', 'salaryItem_addUpTaxableIncome*salaryItem_taxRate-salaryItem_quickDeductionFactor', 1, 0, to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651748978482, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼ.ۼԤԤ˰}', 'addUpSituation_addUpAdvanceTax', 1, 0, to_date('2022-05-05 19:09:38','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:09:38','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749111981, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ǰۼӦ˰}-{нĿ.ǰۼѿ۽˰ϼ}-{нĿ.ǰۼƼ˰ϼ}', 'salaryItem_addUpTaxPayable-salaryItem_addUpAdvanceTax-salaryItem_addUpTaxDeduction', 1, 0, to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749240004, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£ΣӦ˰ϼ}-{нĿ.£Σר۳ϼ}-{нĿ.£ΣӦ˰}+{нĿ.˰ϼ}+{нĿ.˰ϼ}-{нĿ.˰ۿϼ}', 'salaryItem_income-salaryItem_specialDeduction-salaryItem_refundedOrSupplementedTax+salaryItem_afterTaxAdjustmentTotal+salaryItem_afterTaxReimbursementTotal-salaryItem_afterTaxDeductionsTotal', 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749398360, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.ҵ}', 'welfare_9007otherPer', 1, 0, to_date('2022-05-05 19:16:38','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:16:38','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749448800, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.ҵ}', 'otherDeduction_businessHealthyInsurance', 1, 0, to_date('2022-05-05 19:17:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:17:29','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749487187, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.˰ϱ}', 'otherDeduction_taxDelayEndowmentInsurance', 1, 0, to_date('2022-05-05 19:18:07','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:18:07','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749540147, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.}', 'otherDeduction_otherDeduction', 1, 0, to_date('2022-05-05 19:19:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:19:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749595061, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.׼۳ľ}', 'otherDeduction_deductionAllowedDonation', 1, 0, to_date('2022-05-05 19:19:55','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:19:55','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651749675268, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£Σ׼ʿ۳ľ}+{ۼ.ۼ׼۳ľ}', 'salaryItem_allowedDonation+addUpSituation_addUpAllowedDonation', 1, 0, to_date('2022-05-05 19:21:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:21:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651801433504, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.籣˺ϼ}+{ۼ.ۼ籣˺ϼ}', 'welfare_socialPerSum+addUpSituation_addUpSocialSecurityTotal', 1, 0, to_date('2022-05-06 09:43:54','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:43:54','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651801586972, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.˺ϼ}+{ۼ.ۼƹ˺ϼ}', 'welfare_fundPerSum+addUpSituation_addUpAccumulationFundTotal', 1, 0, to_date('2022-05-06 09:46:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:46:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1651801667770, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.˺ϼ}+{ۼ.ۼҵְҵ}', 'welfare_otherPerSum+addUpSituation_addUpEnterpriseAndOther', 1, 0, to_date('2022-05-06 09:47:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:47:48','yyyy-MM-dd HH24:mi:ss')) +; +/ + + + + + + +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651736818266, '', 1651736817711, 'salaryItem_baseSalary', '{нĿ.}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 15:46:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 15:46:58','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651736818329, 'λ', 1651736817711, 'salaryItem_postSalary', '{нĿ.λ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 15:46:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 15:46:58','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737360610, 'ս', 1651737358294, 'salaryItem_annualBonus', '{нĿ.ս}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 15:55:58','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 15:55:58','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737636061, 'ڿۿ', 1651737635353, 'salaryItem_attendanceDeduction', '{нĿ.ڿۿ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:00:35','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:00:35','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737859281, 'нϼ', 1651737859216, 'salaryItem_wagesTotal', '{нĿ.нϼ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737859342, 'ȫһԽϼ', 1651737859216, 'salaryItem_annualBonusTotal', '{нĿ.ȫһԽϼ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651737859401, '˰ǰۿϼ', 1651737859216, 'salaryItem_preTaxDeductionsTotal', '{нĿ.˰ǰۿϼ}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:04:19','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738035450, '£ΣӦ˰ϼ', 1651738034028, 'salaryItem_income', '{нĿ.£ΣӦ˰ϼ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:07:14','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:07:14','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738035488, 'ۼ', 1651738034028, 'addUpSituation_addUpIncome', '{ۼ.ۼ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-05 16:07:14','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:07:14','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738832854, 'ϸ', 1651738826550, 'salaryItem_endowmentInsurance', '{нĿ.ϸ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738837363, 'ҽƸ', 1651738826550, 'salaryItem_medicalInsurance', '{нĿ.ҽƸ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738837909, 'ʧҵ', 1651738826550, 'salaryItem_unemploymentInsurance', '{нĿ.ʧҵ}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651738838429, '', 1651738826550, 'salaryItem_housingProvidentFund', '{нĿ.}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:20:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739002623, '£Σר۳ϼ', 1651739000845, 'salaryItem_specialDeduction', '{нĿ.£Σר۳ϼ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739002682, 'ۼ籣˺ϼ', 1651739000845, 'addUpSituation_addUpSocialSecurityTotal', '{ۼ.ۼ籣˺ϼ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739003139, 'ۼƹ˺ϼ', 1651739000845, 'addUpSituation_addUpAccumulationFundTotal', '{ۼ.ۼƹ˺ϼ}', 'number', 'addUpSituation', 2, 1, 0, to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:23:21','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739054270, 'ۼŮ', 1651739053212, 'addUpDeductions_addUpChildEducation', '{ۼרӿ۳.ۼŮ}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-05 16:24:13','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:24:13','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739101122, 'ۼסϢ', 1651739100651, 'addUpSituation_addUpHousingLoannumbererest', '{ۼ.ۼסϢ}', 'number', 'addUpSituation', 0, 1, 0, to_date('2022-05-05 16:25:01','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:25:01','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739151221, 'ۼס', 1651739151122, 'addUpSituation_addUpHousingRent', '{ۼ.ۼס}', 'number', 'addUpSituation', 0, 1, 0, to_date('2022-05-05 16:25:51','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:25:51','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739213082, 'ۼƼ', 1651739212437, 'addUpSituation_addUpContinuingEducation', '{ۼ.ۼƼ}', 'number', 'addUpSituation', 0, 1, 0, to_date('2022-05-05 16:26:52','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:26:52','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739311009, 'ۼ', 1651739310959, 'addUpSituation_addUpSupportElderly', '{ۼ.ۼ}', 'number', 'addUpSituation', 0, 1, 0, to_date('2022-05-05 16:28:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:28:31','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411502, 'ۼŮ', 1651739411365, 'salaryItem_addUpChildEducation', '{нĿ.ۼŮ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411637, 'ۼסϢ', 1651739411365, 'salaryItem_addUpHousingLoannumbererest', '{нĿ.ۼסϢ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411715, 'ۼס', 1651739411365, 'salaryItem_addUpHousingRent', '{нĿ.ۼס}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739411773, 'ۼƼ', 1651739411365, 'salaryItem_addUpContinuingEducation', '{нĿ.ۼƼ}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739412718, 'ۼ', 1651739411365, 'salaryItem_addUpSupportElderly', '{нĿ.ۼ}', 'number', 'salaryItem', 4, 1, 0, to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:30:11','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739819892, '', 1651739815651, 'salaryItem_annuity', '{нĿ.}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739822564, 'ҵ', 1651739815651, 'salaryItem_commercialHealthInsurance', '{нĿ.ҵ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739826637, '˰ϱ', 1651739815651, 'salaryItem_taxDeferredEndowmentInsurance', '{нĿ.˰ϱ}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739828954, 'Ʋԭֵ?', 1651739815651, 'salaryItem_originalValueOfProperty', '{нĿ.Ʋԭֵ}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739829915, '۳˰', 1651739815651, 'salaryItem_deductedTax', '{нĿ.۳˰}', 'number', 'salaryItem', 4, 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651739830465, '', 1651739815651, 'salaryItem_other', '{нĿ.}', 'number', 'salaryItem', 5, 1, 0, to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:36:56','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740240713, '£Σ۳ϼ', 1651740238860, 'salaryItem_otherDeduction', '{нĿ.£Σ۳ϼ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740241221, 'ۼ˰۳', 1651740238860, 'addUpSituation_addUpOtherDeduction', '{ۼ.ۼ˰۳}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740241717, 'ۼҵְҵ', 1651740238860, 'addUpSituation_addUpEnterpriseAndOther', '{ۼ.ۼҵְҵ}', 'number', 'addUpSituation', 2, 1, 0, to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:43:59','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740397497, '£Σ', 1651740397225, 'salaryItem_subtraction', '{нĿ.£Σ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 16:46:37','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:46:37','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651740397989, 'ۼƼ', 1651740397225, 'addUpSituation_addUpSubtraction', '{ۼ.ۼƼ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-05 16:46:37','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 16:46:37','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742185950, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742185995, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186035, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186085, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186122, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 4, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186155, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 5, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742186199, 'ǰۼӦ˰ö', 1651742185837, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 6, 1, 0, to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:16:26','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742704826, 'ǰۼӦ˰ö', 1651742702735, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742705308, 'ǰۼӦ˰ö', 1651742702735, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742705782, 'ǰۼӦ˰ö', 1651742702735, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742705831, 'ǰۼӦ˰ö', 1651742702735, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742706306, 'ǰۼӦ˰ö', 1651742702735, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 4, 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651742706368, 'ǰۼӦ˰ö', 1651742702735, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 5, 1, 0, to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 17:25:03','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745446904, 'ǰۼӦ˰ϼ', 1651745445982, 'salaryItem_addUpIncome', '{нĿ.ǰۼӦ˰ϼ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745447442, 'ǰۼר۳ϼ', 1651745445982, 'salaryItem_addUpSpecialDeduction', '{нĿ.ǰۼר۳ϼ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745447969, 'ǰۼרӿ۳ϼ', 1651745445982, 'salaryItem_addUpSpeAddiDeduction', '{нĿ.ǰۼרӿ۳ϼ}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745448475, 'ǰۼ۳ϼ', 1651745445982, 'salaryItem_addUpOtherDeduction', '{нĿ.ǰۼ۳ϼ}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745451616, 'ǰۼƼ', 1651745445982, 'salaryItem_addUpSubtraction', '{нĿ.ǰۼƼ}', 'number', 'salaryItem', 4, 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651745452097, 'ǰۼ׼۳ľ', 1651745445982, 'salaryItem_addUpAllowedDonation', '{нĿ.ǰۼ׼۳ľ}', 'number', 'salaryItem', 5, 1, 0, to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 18:10:46','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748888918, 'ǰۼӦ˰ö', 1651748888864, 'salaryItem_addUpTaxableIncome', '{нĿ.ǰۼӦ˰ö}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748888952, '£Σн˰˰', 1651748888864, 'salaryItem_taxRate', '{нĿ.£Σн˰˰}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748888989, '£Σн˰۳', 1651748888864, 'salaryItem_quickDeductionFactor', '{нĿ.£Σн˰۳}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:08:09','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651748978520, 'ۼԤԤ˰', 1651748978482, 'addUpSituation_addUpAdvanceTax', '{ۼ.ۼԤԤ˰}', 'number', 'addUpSituation', 0, 1, 0, to_date('2022-05-05 19:09:38','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:09:38','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749112037, 'ǰۼӦ˰', 1651749111981, 'salaryItem_addUpTaxPayable', '{нĿ.ǰۼӦ˰}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749112068, 'ǰۼѿ۽˰ϼ', 1651749111981, 'salaryItem_addUpAdvanceTax', '{нĿ.ǰۼѿ۽˰ϼ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749112116, 'ǰۼƼ˰ϼ', 1651749111981, 'salaryItem_addUpTaxDeduction', '{нĿ.ǰۼƼ˰ϼ}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:11:52','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240040, '£ΣӦ˰ϼ', 1651749240004, 'salaryItem_income', '{нĿ.£ΣӦ˰ϼ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240082, '£Σר۳ϼ', 1651749240004, 'salaryItem_specialDeduction', '{нĿ.£Σר۳ϼ}', 'number', 'salaryItem', 1, 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240117, '£ΣӦ˰', 1651749240004, 'salaryItem_refundedOrSupplementedTax', '{нĿ.£ΣӦ˰}', 'number', 'salaryItem', 2, 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240164, '˰ϼ', 1651749240004, 'salaryItem_afterTaxAdjustmentTotal', '{нĿ.˰ϼ}', 'number', 'salaryItem', 3, 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240199, '˰ϼ', 1651749240004, 'salaryItem_afterTaxReimbursementTotal', '{нĿ.˰ϼ}', 'number', 'salaryItem', 4, 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749240245, '˰ۿϼ', 1651749240004, 'salaryItem_afterTaxDeductionsTotal', '{нĿ.˰ۿϼ}', 'number', 'salaryItem', 5, 1, 0, to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:14:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749398399, 'ҵ', 1651749398360, 'welfare_9007otherPer', '{籣.ҵ}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-05 19:16:38','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:16:38','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749448843, 'ҵ', 1651749448800, 'otherDeduction_businessHealthyInsurance', '{˰۳.ҵ}', 'number', 'otherDeduction', 0, 1, 0, to_date('2022-05-05 19:17:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:17:29','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749487225, '˰ϱ', 1651749487187, 'otherDeduction_taxDelayEndowmentInsurance', '{˰۳.˰ϱ}', 'number', 'otherDeduction', 0, 1, 0, to_date('2022-05-05 19:18:07','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:18:07','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749540213, '', 1651749540147, 'otherDeduction_otherDeduction', '{˰۳.}', 'number', 'otherDeduction', 0, 1, 0, to_date('2022-05-05 19:19:00','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:19:00','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749596472, '׼۳ľ', 1651749595061, 'otherDeduction_deductionAllowedDonation', '{˰۳.׼۳ľ}', 'number', 'otherDeduction', 0, 1, 0, to_date('2022-05-05 19:19:55','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:19:55','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749675326, '£Σ׼ʿ۳ľ', 1651749675268, 'salaryItem_allowedDonation', '{нĿ.£Σ׼ʿ۳ľ}', 'number', 'salaryItem', 0, 1, 0, to_date('2022-05-05 19:21:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:21:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749675365, 'ۼ׼۳ľ', 1651749675268, 'addUpSituation_addUpAllowedDonation', '{ۼ.ۼ׼۳ľ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-05 19:21:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:21:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749914793, 'ϱո', 1651749914746, 'welfare_9001socialPer', '{籣.ϱո}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-05 19:25:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:25:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651749958917, 'ҽƱո', 1651749958879, 'welfare_9002socialPer', '{籣.ҽƱո}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-05 19:25:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:25:59','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651750005320, 'ʧҵո', 1651750005281, 'welfare_9004socialPer', '{籣.ʧҵո}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-05 19:26:45','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:26:45','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651750034727, 'ס', 1651750034689, 'welfare_9006fundPer', '{籣.ס}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-05 19:27:15','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-05 19:27:15','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801435862, '籣˺ϼ', 1651801433504, 'welfare_socialPerSum', '{籣.籣˺ϼ}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-06 09:43:54','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:43:54','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801436423, 'ۼ籣˺ϼ', 1651801433504, 'addUpSituation_addUpSocialSecurityTotal', '{ۼ.ۼ籣˺ϼ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-06 09:43:54','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:43:54','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801587331, '˺ϼ', 1651801586972, 'welfare_fundPerSum', '{籣.˺ϼ}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-06 09:46:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:46:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801587794, 'ۼƹ˺ϼ', 1651801586972, 'addUpSituation_addUpAccumulationFundTotal', '{ۼ.ۼƹ˺ϼ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-06 09:46:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:46:27','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801669969, '˺ϼ', 1651801667770, 'welfare_otherPerSum', '{籣.˺ϼ}', 'number', 'welfare', 0, 1, 0, to_date('2022-05-06 09:47:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:47:48','yyyy-MM-dd HH24:mi:ss')) +; +/ +INSERT into hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1651801670474, 'ۼҵְҵ', 1651801667770, 'addUpSituation_addUpEnterpriseAndOther', '{ۼ.ۼҵְҵ}', 'number', 'addUpSituation', 1, 1, 0, to_date('2022-05-06 09:47:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-06 09:47:48','yyyy-MM-dd HH24:mi:ss')) +; +/ + + + +INSERT into hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291652, 'taxAgentName', 0, 0, 0, to_date('2022-02-23 17:32:08','yyyy-MM-dd HH24:mi:ss'), to_date('2022-02-23 17:32:08','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291653, 'username', 1, 0, 0, to_date('2022-02-23 17:32:08','yyyy-MM-dd HH24:mi:ss'), to_date('2022-02-23 17:32:08','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_emp_field(id, field_code, sorted_index, can_delete, creator, create_time, update_time, delete_type, tenant_key) VALUES (681983911359291654, 'departmentName', 2, 0, 0, to_date('2022-02-23 17:32:08','yyyy-MM-dd HH24:mi:ss'), to_date('2022-02-23 17:32:08','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams'); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368900, 4, 703459464954929153, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368899, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368902, 4, 703458434280095745, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368901, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368903, 4, 703458558739300353, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368901, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368905, 4, 674914626953093123, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368904, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368906, 4, 674914626953093124, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368904, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368907, 4, 674914626953093127, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368904, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368908, 4, 674916065864646659, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368904, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368910, 4, 704467747234045953, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368909, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368911, 4, 704468391612751873, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368909, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368912, 4, 704468443048992769, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368909, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368913, 4, 704468490269204481, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368909, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368914, 4, 704468528928063488, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 704495325212368909, 4); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (704495325212368915, 4, 703459151591383041, 1, 0, 0, to_date('2022-03-14 11:32:32','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-17 16:14:11','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312448, 1, 703459151591383041, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312449, 1, 674861648655892480, 1, 1, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312450, 1, 674861768948531201, 1, 1, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312451, 1, 674861880508628992, 1, 1, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312452, 1, 674920588574261248, 1, 1, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312453, 1, 674853617092214790, 1, 0, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 4); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312454, 1, 674853617092214791, 1, 0, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 5); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312455, 1, 674914626953093129, 1, 0, 0, to_date('2022-03-14 11:32:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 6); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312456, 1, 703419929857687552, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 7); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312457, 1, 674853617092214792, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312458, 1, 674853617092214793, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312459, 1, 674853617092214795, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312460, 1, 674853617092214796, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312461, 1, 700599184238075904, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 4); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312462, 1, 700599446244319233, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 5); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312463, 1, 674853617092214797, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 6); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312464, 1, 697532371614588928, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 7); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312465, 1, 697532667749400576, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 8); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312466, 1, 697536344384012289, 1, 0, 0, to_date('2022-03-18 16:24:49','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 9); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312467, 1, 674853617092214798, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614092, 10); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312468, 1, 674853617092214803, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312469, 1, 674853617092214802, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312470, 1, 674853617092214801, 1, 0, 0, to_date('2022-03-14 11:32:29','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312471, 1, 674853617092214800, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312472, 1, 674853617092214799, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 4); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312473, 1, 705641858303836161, 1, 0, 0, to_date('2022-03-17 13:48:51','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 5); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312474, 1, 674853617092214804, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 6); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312475, 1, 674853617092214807, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312476, 1, 674853617092214808, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312477, 1, 674914626953093122, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312478, 1, 674914626953093123, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312479, 1, 674914626953093124, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 4); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312480, 1, 674914626953093127, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 5); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312481, 1, 674853617092214805, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 6); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312482, 1, 674853617092214806, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 7); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312483, 1, 674916065864646659, 1, 0, 0, to_date('2022-03-18 16:30:21','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 8); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312484, 1, 674916065864646660, 1, 0, 0, to_date('2022-03-18 16:30:21','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 9); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312485, 1, 674853617092214811, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 0); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312486, 1, 674853617092214809, 1, 0, 0, to_date('2022-03-14 11:32:30','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 1); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312487, 1, 674853617092214810, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 2); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312488, 1, 674853617092214812, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 3); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312489, 1, 674853617092214813, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 4); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312490, 1, 674916065864646661, 1, 1, 0, to_date('2022-03-18 16:33:37','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 5); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312491, 1, 674916065864646658, 1, 1, 0, to_date('2022-03-18 16:33:37','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 6); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312492, 1, 674853617092214814, 1, 0, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614119, 7); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312493, 1, 674853617092214815, 1, 1, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:23','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614126, 6); +/ + +INSERT into hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (706066600446312494, 1, 700769462612156416, 1, 1, 0, to_date('2022-03-14 11:32:31','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-18 16:59:24','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614126, 7); +/ + + + + + + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614083, 1, 'Լ˰', 0, ' ', SYSDATE, SYSDATE, 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614092, 1, 'ר۳', 1, ' ', SYSDATE, SYSDATE, 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614103, 1, 'ۼרӿ۳', 2, ' ', to_date('2022-03-11 14:49:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-11 14:49:27','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614110, 1, '۳Ϣ', 3, ' ', to_date('2022-03-11 14:49:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-11 14:49:27','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614119, 1, '˰', 4, ' ', to_date('2022-03-11 14:49:27','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-11 14:49:27','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (703433961629614126, 1, 'Ӧʵ', 5, ' ', to_date('2022-03-11 14:49:28','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-11 14:49:28','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368899, 4, 'Ŀ', 0, ' ', to_date('2022-03-15 17:52:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-15 18:14:53','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368901, 4, '뼰˰', 1, ' ', to_date('2022-03-15 17:52:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-15 18:14:53','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368904, 4, '۳Ϣ', 2, ' ', to_date('2022-03-15 17:52:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-15 18:14:53','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_sob_default_item_group(id, income_category, name, sorted_index, description, create_time, update_time, creator, delete_type, tenant_key) VALUES (704495325212368909, 4, '˰', 3, ' ', to_date('2022-03-15 17:52:48','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-15 18:14:53','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9001, 'ϱ', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9002, 'ҽƱ', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9003, '˱', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9004, 'ʧҵ', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9005, '', 1, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9006, 'ס', 2, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9007, 'ҵ', 3, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ + +INSERT into hrsa_insurance_category (id, insurance_name, welfare_type, is_use, payment_scope, data_type, create_time, update_time, creator, delete_type, tenant_key) VALUES (9008, 'ס', 2, 1, '1,2', 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 0, 'all_teams'); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202205200203.sql b/resource/sqlupgrade/ST/sql202205200203.sql new file mode 100644 index 000000000..500c1824d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202205200203.sql @@ -0,0 +1,13 @@ +ALTER TABLE hrsa_add_up_situation ADD ( + add_up_illness_medical varchar2(255) NULL , + add_up_tax_savings varchar2(255) NULL , + add_up_infant_care varchar2(255) NULL +); +/ + +ALTER TABLE hrsa_add_up_deduction add ( + add_up_illness_medical varchar2(255) NULL, + add_up_infant_care varchar2(255) NULL +); +/ + diff --git a/resource/sqlupgrade/ST/sql202205310203.sql b/resource/sqlupgrade/ST/sql202205310203.sql new file mode 100644 index 000000000..96e521526 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202205310203.sql @@ -0,0 +1,48 @@ +INSERT INTO hrsa_formula (id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1653993466778, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼסϢ}', 'addUpDeductions_addUpHousingLoanInterest', 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993466787, 'ۼסϢ', 1653993466778, 'addUpDeductions_addUpHousingLoanInterest', '{ۼרӿ۳.ۼסϢ}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653993837931, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼס}', 'addUpDeductions_addUpHousingRent', 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993837947, 'ۼס', 1653993837931, 'addUpDeductions_addUpHousingRent', '{ۼרӿ۳.ۼס}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653993954233, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼƼ}', 'addUpDeductions_addUpContinuingEducation', 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653993954257, 'ۼƼ', 1653993954233, 'addUpDeductions_addUpContinuingEducation', '{ۼרӿ۳.ۼƼ}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula ( id , name , description , module , use_for , reference_type , return_type , validate_type , extend_param , formula , formulaRunScript , creator , delete_type , create_time , update_time ) VALUES (1653994061764, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼ}', 'addUpDeductions_addUpSupportElderly', 1, 0,to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'),to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var ( id , name , formula_id , field_id , field_name , field_type , source , order_index , creator , delete_type , create_time , update_time ) VALUES (1653994061780, 'ۼ', 1653994061764, 'addUpDeductions_addUpSupportElderly', '{ۼרӿ۳.ۼ}', 'number', 'addUpDeductions', 0, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +update hrsa_sys_salary_item set formula_id = 1653993466778 where id = 674853617092214800; +/ + +update hrsa_sys_salary_item set formula_id = 1653993837931 where id = 674853617092214801; +/ + +update hrsa_sys_salary_item set formula_id = 1653993954233 where id = 674853617092214802; +/ + +update hrsa_sys_salary_item set formula_id = 1653994061764 where id = 674853617092214803; +/ + +update hrsa_salary_item set formula_id = 1653993466778 where sys_salary_item_id = 674853617092214800; +/ + +update hrsa_salary_item set formula_id = 1653993837931 where sys_salary_item_id = 674853617092214801; +/ + +update hrsa_salary_item set formula_id = 1653993954233 where sys_salary_item_id = 674853617092214802; +/ + +update hrsa_salary_item set formula_id = 1653994061764 where sys_salary_item_id = 674853617092214803; +/ + diff --git a/resource/sqlupgrade/ST/sql202206071403.sql b/resource/sqlupgrade/ST/sql202206071403.sql new file mode 100644 index 000000000..9419d893a --- /dev/null +++ b/resource/sqlupgrade/ST/sql202206071403.sql @@ -0,0 +1,132 @@ +CREATE TABLE hrsa_tax_agent_emp +( + id NUMBER(38,0) primary key NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + employee_name varchar2(255) +); +/ + +CREATE TABLE hrsa_tax_agent_emp_change +( + id NUMBER(38,0) primary key NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + change_type number DEFAULT 0 , + employee_name varchar2(255) DEFAULT NULL, + module_type NUMBER(4,0) DEFAULT 0 +); +/ + +CREATE TABLE hrsa_tax_agent_admin +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT 0, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_tax_agent_manage_range +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) DEFAULT 0, + tax_agent_sub_admin_id NUMBER(38,0) DEFAULT 0, + target_type number DEFAULT 1, + target_id NUMBER(38,0) NOT NULL, + employee_status varchar2(100) NOT NULL, + include_type number DEFAULT 1, + creator NUMBER(38,0) DEFAULT '0', + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + range_type number DEFAULT 0 +); +/ + +CREATE TABLE hrsa_tax_agent_base +( + id NUMBER(38,0) primary key NOT NULL, + devolution_status NUMBER(11,0) DEFAULT 0 , + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT '0', + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '' +); +/ + +CREATE TABLE hrsa_tax_agent_sub_admin +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + description varchar2(100) , + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT '0', + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + remark clob +); +/ + +CREATE TABLE hrsa_tax_agent_sub_admin_emp +( + id NUMBER(38,0) primary key NOT NULL, + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate, + creator NUMBER(38,0) DEFAULT '0', + delete_type number DEFAULT 0 , + tenant_key varchar2(10) DEFAULT '', + tax_agent_id NUMBER(38,0) NOT NULL, + tax_agent_sub_admin_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + employee_name varchar2(255) +); +/ + +ALTER TABLE hrsa_tax_agent add ( + payment_agency varchar2(255) +); +/ + +ALTER TABLE hrsa_salary_sob add ( + tax_agent_id NUMBER(38,0) +); +/ + +INSERT INTO hrsa_tax_agent_base(id, devolution_status, create_time, update_time, creator, delete_type, tenant_key) VALUES (1653303537239, 1, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 1, 0, 'all_teams'); +/ + +ALTER TABLE hrsa_bill_detail_temp add ( + payment_organization NUMBER(38,0) +); +/ + +ALTER TABLE hrsa_bill_detail add ( + payment_organization NUMBER(38,0) +); +/ + +ALTER TABLE hrsa_bill_batch add ( + payment_organization NUMBER(38,0) +); +/ + diff --git a/resource/sqlupgrade/ST/sql202206090403.sql b/resource/sqlupgrade/ST/sql202206090403.sql new file mode 100644 index 000000000..586aaaa5f --- /dev/null +++ b/resource/sqlupgrade/ST/sql202206090403.sql @@ -0,0 +1,10 @@ +ALTER TABLE hrsa_tax_declaration add ( + income_category number +); +/ + +ALTER TABLE hrsa_tax_declaration_detail add ( + employee_type number +); +/ + diff --git a/resource/sqlupgrade/ST/sql202206141003.sql b/resource/sqlupgrade/ST/sql202206141003.sql new file mode 100644 index 000000000..f93f0baf6 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202206141003.sql @@ -0,0 +1,45 @@ +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (705641858303836162, 'ۼӤ׶ջ', 'addUpInfantCare', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1655196897860, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703419929857687552, 'ǰۼ˰', 'addUpTaxFreeIncome', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1655197296054, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (705641858303836161, 'ۼƴҽ', 'addUpIllnessMedical', 1, 7, 1, 1, 0, 2, 2, 2, 0, 1655197430967, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655196897860, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼӤ׶ջ}', 'addUpDeductions_addUpInfantCare', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655197296054, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.£Σ˰}+{ۼ.ۼ˰}', 'salaryItem_taxFreeIncome+addUpSituation_addUpTaxExemptIncome', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655197430967, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{ۼרӿ۳.ۼƴҽ}', 'addUpDeductions_addUpIllnessMedical', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655196897869, 'ۼӤ׶ջ', 1655196897860, 'addUpDeductions_addUpInfantCare', '{ۼרӿ۳.ۼӤ׶ջ}', 'number', 'addUpDeductions', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197296059, '£Σ˰', 1655197296054, 'salaryItem_taxFreeIncome', '{нĿ.£Σ˰}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197296063, 'ۼ˰', 1655197296054, 'addUpSituation_addUpTaxExemptIncome', '{ۼ.ۼ˰}', 'number', 'addUpSituation', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655197430986, 'ۼƴҽ', 1655197430967, 'addUpDeductions_addUpIllnessMedical', '{ۼרӿ۳.ۼƴҽ}', 'number', 'addUpDeductions', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (728615865977528321, 1, 705641858303836162, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614103, 7); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845569, 1, 674853617092214787, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 8); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845572, 1, 674853617092214788, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 9); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845578, 1, 674853617092214789, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 10); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845567, 1, 733975748932845568, 1, 1, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614083, 11); +/ + diff --git a/resource/sqlupgrade/ST/sql202206160500.sql b/resource/sqlupgrade/ST/sql202206160500.sql new file mode 100644 index 000000000..de7812981 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202206160500.sql @@ -0,0 +1,41 @@ +delete from SystemRightDetail where rightid =2693; +/ + +delete from SystemRightsLanguage where id =2693; +/ + +delete from SystemRights where id =2693; +/ + +delete from SystemRightToGroup where rightid =2693; +/ + +delete from SystemRightType where id =36; +/ + +delete from SystemRightGroups where id =-22; +/ + +insert into SystemRights (id,rightdesc,righttype,detachable) values (2693,'нȨ','36',0); +/ + +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2693,8,'Salary management authority','Salary management authority'); +/ + +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2693,9,'н','н'); +/ + +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2693,7,'нȨ','нȨ'); +/ + +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43969,'нܹԱ','Salary:Chief',2693); +/ + +insert into SystemRightToGroup(rightid,groupid) values (2693,-22); +/ + +insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-22,'SALARY','нȨ','н'); +/ + +insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (36,'н','н'); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202206230403.sql b/resource/sqlupgrade/ST/sql202206230403.sql new file mode 100644 index 000000000..1c3cd6664 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202206230403.sql @@ -0,0 +1,30 @@ +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1655976865885, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.ۼŮ}+{нĿ.ۼסϢ}+{нĿ.ۼס}+{нĿ.ۼƼ}+{нĿ.ۼ}+{нĿ.ۼƴҽ}+{нĿ.ۼӤ׶ջ}', 'salaryItem_addUpChildEducation+salaryItem_addUpHousingLoanInterest+salaryItem_addUpHousingRent+salaryItem_addUpContinuingEducation+salaryItem_addUpSupportElderly+salaryItem_addUpIllnessMedical+salaryItem_addUpInfantCare', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865909, 'ۼ', 1655976865885, 'salaryItem_addUpSupportElderly', '{нĿ.ۼ}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865913, 'ۼƼ', 1655976865885, 'salaryItem_addUpContinuingEducation', '{нĿ.ۼƼ}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865917, 'ۼס', 1655976865885, 'salaryItem_addUpHousingRent', '{нĿ.ۼס}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865921, 'ۼסϢ', 1655976865885, 'salaryItem_addUpHousingLoanInterest', '{нĿ.ۼסϢ}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865924, 'ۼŮ', 1655976865885, 'salaryItem_addUpChildEducation', '{нĿ.ۼŮ}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865929, 'ۼƴҽ', 1655976865885, 'salaryItem_addUpIllnessMedical', '{нĿ.ۼƴҽ}', 'number', 'salaryItem', 5, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1655976865933, 'ۼӤ׶ջ', 1655976865885, 'salaryItem_addUpInfantCare', '{нĿ.ۼӤ׶ջ}', 'number', 'salaryItem', 6, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +update hrsa_sys_salary_item set formula_id = 1655976865885 where id = 674853617092214804; +/ + +update hrsa_salary_item set formula_id = 1655976865885 where sys_salary_item_id = 674853617092214804; +/ + diff --git a/resource/sqlupgrade/ST/sql202207110803.sql b/resource/sqlupgrade/ST/sql202207110803.sql new file mode 100644 index 000000000..d2526780d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202207110803.sql @@ -0,0 +1,23 @@ +CREATE TABLE hrsa_salary_acct_result_report +( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_sob_id NUMBER(38,0) DEFAULT 0, + salary_acct_emp_id varchar2(200) DEFAULT '', + salary_acct_record_id NUMBER(38,0) DEFAULT 0, + employee_id varchar2(200) DEFAULT '', + tax_agent_id NUMBER(38,0) DEFAULT 0, + salary_item_id NUMBER(38,0) DEFAULT 0, + result_value varchar2(1000) DEFAULT '', + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(10) DEFAULT '', + department_id NUMBER(38,0) DEFAULT 0, + subcompany_id NUMBER(38,0) DEFAULT 0, + costcenter_id NUMBER(38,0) DEFAULT 0, + jobtitle_id NUMBER(38,0) DEFAULT 0, + location_id NUMBER(38,0) DEFAULT 0 +); +/ + diff --git a/resource/sqlupgrade/ST/sql202207120303.sql b/resource/sqlupgrade/ST/sql202207120303.sql new file mode 100644 index 000000000..642836561 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202207120303.sql @@ -0,0 +1,15 @@ +CREATE TABLE hrsa_salary_sys_conf +( + id NUMBER(38,0) primary key NOT NULL, + conf_key varchar2(200) NOT NULL , + conf_value varchar2(500) NOT NULL, + title varchar2(200) , + module varchar2(200) , + order_weight number , + description varchar2(200) , + delete_type number DEFAULT 0 , + create_time date DEFAULT sysdate, + update_time date DEFAULT sysdate +); +/ + diff --git a/resource/sqlupgrade/ST/sql202207210203.sql b/resource/sqlupgrade/ST/sql202207210203.sql new file mode 100644 index 000000000..3a0d343ce --- /dev/null +++ b/resource/sqlupgrade/ST/sql202207210203.sql @@ -0,0 +1,7 @@ +ALTER TABLE hrsa_salary_archive ADD ( + tax_agent_id NUMBER(38,0) NULL , + pay_start_date date NULL , + pay_end_date date NULL +); +/ + diff --git a/resource/sqlupgrade/ST/sql202208051103.sql b/resource/sqlupgrade/ST/sql202208051103.sql new file mode 100644 index 000000000..f6732bf1c --- /dev/null +++ b/resource/sqlupgrade/ST/sql202208051103.sql @@ -0,0 +1,138 @@ +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (700599184238075904, '籣˺ϼ', 'socialSecurityTotal', 1, 7, 1, 1, 0, 2, 2, 2, 7, 1659339100298, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (700599446244319233, '˺ϼ', 'accumulationFundTotal', 1, 7, 1, 1, 0, 2, 2, 2, 7, 1659339063868, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703458434280095745, '', 'laborIncome', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703458558739300353, '˰', 'laborTaxFreeIncome', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703459151591383041, 'ע', 'description', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'string'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (703459464954929153, 'Ŀ', 'incomeItems', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'string'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704467747234045953, '˰', 'laborSubtraction', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659340673739, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468391612751873, '˰Ӧ˰ö', 'laborTaxableIncome', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659340916981, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468443048992769, '˰˰', 'laborTaxRate', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341397524, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468490269204481, '˰۳', 'laborQuickDeductionFactor', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341564390, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (704468528928063488, '˰Ӧ˰', 'laborTaxPayable', 1, 7, 4, 1, 0, 2, 2, 2, 1, 1659341811881, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (733975748932845568, '˰', 'taxAdjustment', 1, 7, 1, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629570, 'ҵ', 'commercialHealthInsurance4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341909423, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629571, '˰ϱ', 'taxDeferredEndowmentInsurance4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341966905, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629572, '', 'other4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659341993723, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629573, '£Σ׼۳ľ', 'allowedDonation4', 1, 7, 4, 0, 0, 2, 2, 2, 8, 1659342041963, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629574, 'ע', 'description4', 1, 7, 4, 1, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'string'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629575, 'ѷнʺϼ', 'issuedTotal', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629576, 'нʺϼ', 'ressueTotal', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, '', 1, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659339063868, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.˺ϼ}', 'welfare_fundPerSum', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659339100298, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{籣.籣˺ϼ}', 'welfare_socialPerSum', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659340673739, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({нĿ.}-{нĿ.˰}<=4000){800/}else{0.2*({нĿ.}-{нĿ.˰})}', 'if(salaryItem_laborIncome-salaryItem_laborTaxFreeIncome<=4000){800/}else{0.2*(salaryItem_laborIncome-salaryItem_laborTaxFreeIncome)}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659340916981, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{нĿ.}-{нĿ.˰}-{нĿ.˰}', 'salaryItem_laborIncome-salaryItem_laborTaxFreeIncome-salaryItem_laborSubtraction', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341397524, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({нĿ.˰Ӧ˰ö}<=20000){0.2/}else if({нĿ.˰Ӧ˰ö}<=50000){0.3/}else{0.4/}', 'if(salaryItem_laborTaxableIncome<=20000){0.2/}else if(salaryItem_laborTaxableIncome<=50000){0.3/}else{0.4/}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341564390, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({нĿ.˰Ӧ˰ö}<=20000){0/}else if({нĿ.˰Ӧ˰ö}<=50000){2000/}else{7000/}', 'if(salaryItem_laborTaxableIncome<=20000){0/}else if(salaryItem_laborTaxableIncome<=50000){2000/}else{7000/}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341811881, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', 'if({нĿ.˰Ӧ˰ö}<=0){0/}else{{нĿ.˰Ӧ˰ö}*{нĿ.˰˰}-{нĿ.˰۳}}', 'if(salaryItem_laborTaxableIncome<=0){0/}else{salaryItem_laborTaxableIncome*salaryItem_laborTaxRate-salaryItem_laborQuickDeductionFactor}', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341909423, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.ҵ}', 'otherDeduction_businessHealthyInsurance', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341966905, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.˰ϱ}', 'otherDeduction_taxDelayEndowmentInsurance', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659341993723, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.}', 'otherDeduction_otherDeduction', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1659342041963, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{}', '{˰۳.׼۳ľ}', 'otherDeduction_deductionAllowedDonation', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659339063886, '˺ϼ', 1659339063868, 'welfare_fundPerSum', '{籣.˺ϼ}', 'number', 'welfare', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659339100354, '籣˺ϼ', 1659339100298, 'welfare_socialPerSum', '{籣.籣˺ϼ}', 'number', 'welfare', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340673751, '', 1659340673739, 'salaryItem_laborIncome', '{нĿ.}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340673754, '˰', 1659340673739, 'salaryItem_laborTaxFreeIncome', '{нĿ.˰}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917032, '', 1659340916981, 'salaryItem_laborIncome', '{нĿ.}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917035, '˰', 1659340916981, 'salaryItem_laborTaxFreeIncome', '{нĿ.˰}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659340917039, '˰', 1659340916981, 'salaryItem_laborSubtraction', '{нĿ.˰}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341397539, '˰Ӧ˰ö', 1659341397524, 'salaryItem_laborTaxableIncome', '{нĿ.˰Ӧ˰ö}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341564447, '˰Ӧ˰ö', 1659341564390, 'salaryItem_laborTaxableIncome', '{нĿ.˰Ӧ˰ö}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811897, '˰Ӧ˰ö', 1659341811881, 'salaryItem_laborTaxableIncome', '{нĿ.˰Ӧ˰ö}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811901, '˰˰', 1659341811881, 'salaryItem_laborTaxRate', '{нĿ.˰˰}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341811904, '˰۳', 1659341811881, 'salaryItem_laborQuickDeductionFactor', '{нĿ.˰۳}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341909473, 'ҵ', 1659341909423, 'otherDeduction_businessHealthyInsurance', '{˰۳.ҵ}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341966920, '˰ϱ', 1659341966905, 'otherDeduction_taxDelayEndowmentInsurance', '{˰۳.˰ϱ}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659341993736, '', 1659341993723, 'otherDeduction_otherDeduction', '{˰۳.}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1659342041967, '׼۳ľ', 1659342041963, 'otherDeduction_deductionAllowedDonation', '{˰۳.׼۳ľ}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + diff --git a/resource/sqlupgrade/ST/sql202208080403.sql b/resource/sqlupgrade/ST/sql202208080403.sql new file mode 100644 index 000000000..b77699221 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202208080403.sql @@ -0,0 +1,54 @@ +Alter table hrsa_bill_detail modify social_payment_base_string varchar2(4000); +/ + +Alter table hrsa_bill_detail modify fund_payment_base_string varchar2(4000); +/ + +Alter table hrsa_bill_detail modify other_payment_base_string varchar2(4000); +/ + +Alter table hrsa_bill_detail modify social_per_json varchar2(4000); +/ + +Alter table hrsa_bill_detail modify fund_per_json varchar2(4000); +/ + +Alter table hrsa_bill_detail modify other_per_json varchar2(4000); +/ + +Alter table hrsa_bill_detail modify social_com_json varchar2(4000); +/ + +Alter table hrsa_bill_detail modify fund_com_json varchar2(4000); +/ + +Alter table hrsa_bill_detail modify other_com_json varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify social_payment_base_string varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify fund_payment_base_string varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify other_payment_base_string varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify social_per_json varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify fund_per_json varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify other_per_json varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify social_com_json varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify fund_com_json varchar2(4000); +/ + +Alter table hrsa_bill_detail_temp modify other_com_json varchar2(4000); +/ + diff --git a/resource/sqlupgrade/ST/sql202208240403.sql b/resource/sqlupgrade/ST/sql202208240403.sql new file mode 100644 index 000000000..2f6c33391 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202208240403.sql @@ -0,0 +1,6 @@ +ALTER TABLE hrsa_social_security_scheme ADD ( + shared_type varchar2(255) NULL , + tax_agent_ids varchar2(500) NULL +); +/ + diff --git a/resource/sqlupgrade/ST/sql202208240503.sql b/resource/sqlupgrade/ST/sql202208240503.sql new file mode 100644 index 000000000..30911c50d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202208240503.sql @@ -0,0 +1,17 @@ +CREATE TABLE HRSA_SALARY_ITEM_HIDE ( + ID NUMBER(38,0) NOT NULL, + SALARY_SOB_ID NUMBER(38,0) NOT NULL, + SALARY_ITEM_ID NUMBER(38,0) NOT NULL, + IS_GROUP NUMBER NOT NULL, + ITEM_HIDE NUMBER(38,0) DEFAULT 0, + CREATOR NUMBER(38,0) NOT NULL, + DELETE_TYPE NUMBER DEFAULT 0 NOT NULL, + TENANT_KEY VARCHAR2(255) NOT NULL, + CREATE_TIME DATE DEFAULT sysdate NOT NULL, + UPDATE_TIME DATE DEFAULT sysdate +); +/ + +ALTER TABLE HRSA_SALARY_ITEM_HIDE ADD CONSTRAINT SYS_C0024450 PRIMARY KEY ("ID"); +/ + diff --git a/resource/sqlupgrade/ST/sql202209010603.sql b/resource/sqlupgrade/ST/sql202209010603.sql new file mode 100644 index 000000000..ee5468226 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202209010603.sql @@ -0,0 +1,6 @@ +drop sequence hrsa_tax_declaration_id; +/ + +DROP TRIGGER hrsa_tax_declaration_Tri; +/ + diff --git a/resource/sqlupgrade/ST/sql202209050303.sql b/resource/sqlupgrade/ST/sql202209050303.sql new file mode 100644 index 000000000..3a43c72c0 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202209050303.sql @@ -0,0 +1,6 @@ +drop sequence hrsa_salary_send_id; +/ + +drop trigger hrsa_salary_send_Tri; +/ + diff --git a/resource/sqlupgrade/ST/sql202210080203.sql b/resource/sqlupgrade/ST/sql202210080203.sql new file mode 100644 index 000000000..a10a1e082 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202210080203.sql @@ -0,0 +1,95 @@ +CREATE TABLE hrsa_excel_bill_detail ( + + id NUMBER(20,0) NOT NULL, + + employee_id NUMBER(20,0) NOT NULL, + + bill_month VARCHAR2(30) NOT NULL, + + bill_status NUMBER(11,0) NOT NULL, + + payment_status NUMBER(11,0) NOT NULL, + + supplementary_month VARCHAR2(50) NULL, + + supplementary_projects VARCHAR2(50) NULL, + + resource_from NUMBER(11,0) NOT NULL, + + social_pay_org NUMBER(11,0) NULL, + + social_account VARCHAR2(50) NULL, + + social_scheme_id NUMBER(20,0) NULL, + + social_payment_base_string CLOB NULL, + + fund_pay_org NUMBER(11,0) NULL, + + fund_account VARCHAR2(50) NULL, + + supplement_fund_account VARCHAR2(50) NULL, + + fund_scheme_id NUMBER(11,0) NULL, + + fund_payment_base_string CLOB NULL, + + other_pay_org NUMBER(11,0) NULL, + + other_scheme_id NUMBER(20,0) NULL, + + other_payment_base_string CLOB NULL, + + social_per_json CLOB NULL, + + social_per_sum CLOB NULL, + + fund_per_json CLOB NULL, + + fund_per_sum CLOB NULL, + + other_per_json CLOB NULL, + + other_per_sum CLOB NULL, + + per_sum CLOB NULL, + + social_com_json CLOB NULL, + + social_com_sum CLOB NULL, + + fund_com_json CLOB NULL, + + fund_com_sum CLOB NULL, + + other_com_json CLOB NULL, + + other_com_sum CLOB NULL, + + com_sum CLOB NULL, + + social_sum CLOB NULL, + + fund_sum CLOB NULL, + + other_sum CLOB NULL, + + total CLOB NULL, + + creator NUMBER(20,0) NOT NULL, + + create_time DATE DEFAULT sysdate, + + update_time DATE DEFAULT sysdate, + + delete_type NUMBER(11,0) NOT NULL, + + tenant_key VARCHAR2(255), + + payment_organization NUMBER(20,0) NULL, + +PRIMARY KEY ( id ) + +); +/ + diff --git a/resource/sqlupgrade/ST/sql202210080403.sql b/resource/sqlupgrade/ST/sql202210080403.sql new file mode 100644 index 000000000..14d9ffb69 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202210080403.sql @@ -0,0 +1,7 @@ +ALTER TABLE hrsa_salary_archive ADD ( + run_status varchar2(255) NULL , + add_type varchar2(255) NULL , + stop_type varchar2(255) NULL +); +/ + diff --git a/resource/sqlupgrade/ST/sql202210170203.sql b/resource/sqlupgrade/ST/sql202210170203.sql new file mode 100644 index 000000000..1edd12505 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202210170203.sql @@ -0,0 +1,31 @@ +CREATE TABLE hrsa_insurance_base_info ( + + id NUMBER(38,0) NOT NULL, + + employee_id NUMBER(38,0) NOT NULL, + + payment_organization NUMBER(11,0) NULL, + + social_archives_id NUMBER(38,0) NULL, + + fund_archives_id NUMBER(38,0) NULL, + + other_archives_id NUMBER(38,0) NULL, + + tenant_key VARCHAR2(255) NOT NULL, + + creator NUMBER(11,0) NOT NULL, + + delete_type NUMBER(11,0) NOT NULL, + + create_time DATE NOT NULL, + + update_time DATE NOT NULL, + + run_status VARCHAR2(20) NOT NULL, + +PRIMARY KEY ( id ) + +); +/ + diff --git a/resource/sqlupgrade/ST/sql202210170303.sql b/resource/sqlupgrade/ST/sql202210170303.sql new file mode 100644 index 000000000..e4479da1b --- /dev/null +++ b/resource/sqlupgrade/ST/sql202210170303.sql @@ -0,0 +1,3 @@ +ALTER TABLE hrsa_salary_sob_range ADD employee_statuses VARCHAR(255); +/ + diff --git a/resource/sqlupgrade/ST/sql202211090103.sql b/resource/sqlupgrade/ST/sql202211090103.sql new file mode 100644 index 000000000..7de92a03c --- /dev/null +++ b/resource/sqlupgrade/ST/sql202211090103.sql @@ -0,0 +1,42 @@ +create table hrsa_special_add_deduction +( +id NUMBER(38, 0) primary key, +employee_id NUMBER(38, 0) not null, +tax_agent_id NUMBER(38, 0) not null, +children_education varchar2(255) default '' , +continuing_education varchar2(255) default '' , +housing_loan_interest varchar2(255) default '' , +housing_rent varchar2(255) default '', +supporting_elder varchar2(255) default '' , +serious_illness_treatment varchar2(255) default '' , +infant_care varchar2(255) default '', +create_time DATE DEFAULT sysdate, +update_time DATE DEFAULT sysdate, +creator NUMBER(38, 0), +delete_type NUMBER(11, 0) default 0 , +tenant_key varchar2(10) default '' +); +/ + +create sequence hrsa_special_a_d_id +start with 1 +increment by 1 +nomaxvalue +nocycle +nocache; +/ + +CREATE TRIGGER hrsa_spec_add_dct_trigger +before INSERT ON hrsa_special_add_deduction FOR each ROW WHEN (new.id IS NULL) +BEGIN +SELECT hrsa_special_a_d_id.nextval into:New.id from dual; +END; +/ + +CREATE TRIGGER hrsa_spec_add_dct_time_trigger +before UPDATE ON hrsa_special_add_deduction FOR each ROW WHEN (new.update_time IS NOT NULL) +BEGIN +SELECT sysdate into:new.update_time from dual; +END; +/ + diff --git a/resource/sqlupgrade/ST/sql202211090301.sql b/resource/sqlupgrade/ST/sql202211090301.sql new file mode 100644 index 000000000..d35f99180 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202211090301.sql @@ -0,0 +1,119 @@ +delete from HtmlLabelIndex where id = 539971 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 539971,'' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539971 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539971 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539971 as indexid ,'' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539971 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539971 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539971 as indexid ,'Rule Settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539971 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539971 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539971 as indexid ,'ҎtO' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539971 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlModuleLabel where indexId = 539971 and moduleCode = 'HRM' and type = 'label' ; +/ + +insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539971) ; +/ + +delete from HtmlLabelIndex where id = 539970 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 539970,'Ӧ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539970 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539970 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539970 as indexid ,'Ӧ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539970 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539970 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539970 as indexid ,'Apply Settings' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539970 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539970 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539970 as indexid ,'O' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539970 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlModuleLabel where indexId = 539970 and moduleCode = 'HRM' and type = 'label' ; +/ + +insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539970) ; +/ + +delete from HtmlLabelIndex where id = 539968 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 539968,'' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539968 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539968 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539968 as indexid ,'' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539968 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539968 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539968 as indexid ,'set up' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539968 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539968 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539968 as indexid ,'O' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539968 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlModuleLabel where indexId = 539968 and moduleCode = 'HRM' and type = 'label' ; +/ + +insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539968) ; +/ + +delete from HtmlLabelIndex where id = 539967 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 539967,'רӿ۳' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 539967 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539967 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539967 as indexid ,'רӿ۳' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539967 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539967 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539967 as indexid ,'Special additional deduction' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539967 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 539967 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 539967 as indexid ,'헸ӿ۳' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 539967 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlModuleLabel where indexId = 539967 and moduleCode = 'HRM' and type = 'label' ; +/ + +insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',539967) ; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202211090402.sql b/resource/sqlupgrade/ST/sql202211090402.sql new file mode 100644 index 000000000..5306d7b0f --- /dev/null +++ b/resource/sqlupgrade/ST/sql202211090402.sql @@ -0,0 +1,59 @@ +Delete from LeftMenuInfo where id=100183; +/ + +Delete from LeftMenuConfig where infoid=100183; +/ + +call LMConfig_U_ByInfoInsert (2,100181,0); +/ + +call LMInfo_Insert (100183,539970,'','',2,100181,0,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/appconfig' where id = 100183; +/ + +Delete from LeftMenuInfo where id=100182; +/ + +Delete from LeftMenuConfig where infoid=100182; +/ + +call LMConfig_U_ByInfoInsert (2,100181,-1); +/ + +call LMInfo_Insert (100182,539971,'','',2,100181,-1,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/sysconfig-1' where id = 100182; +/ + +Delete from LeftMenuInfo where id=100180; +/ + +Delete from LeftMenuConfig where infoid=100180; +/ + +call LMConfig_U_ByInfoInsert (2,100126,0); +/ + +call LMInfo_Insert (100180,539967,'','',2,100126,0,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/dataAcquisition/specialAddDeduction' where id = 100180; +/ + +Delete from LeftMenuInfo where id=100181; +/ + +Delete from LeftMenuConfig where infoid=100181; +/ + +call LMConfig_U_ByInfoInsert (2,100118,9); +/ + +call LMInfo_Insert (100181,539968,'','',2,100118,9,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100181; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202211170503.sql b/resource/sqlupgrade/ST/sql202211170503.sql new file mode 100644 index 000000000..5a985e45e --- /dev/null +++ b/resource/sqlupgrade/ST/sql202211170503.sql @@ -0,0 +1,8 @@ +alter table HRSA_SALARY_ITEM add SHARED_TYPE number(11); +/ + +alter table HRSA_SALARY_ITEM add TAX_AGENT_IDS varchar2(1024); +/ + +ALTER TABLE HRSA_SALARY_ACCT_RECORD ADD LOCK_SALARY_ITEM_IDS varchar2(2000); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202212080903.sql b/resource/sqlupgrade/ST/sql202212080903.sql new file mode 100644 index 000000000..a17e5c563 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202212080903.sql @@ -0,0 +1,70 @@ +CREATE TABLE hrsa_compensation_log ( + + id NUMBER(20,0) NOT NULL, + + payment_agency NUMBER(20,0) NULL, + + payment_organization NUMBER(20,0) NULL, + + employee_id NUMBER(20,0) NULL, + + welfare_type NUMBER(11,0) NULL, + + category_type VARCHAR2(100) NULL, + + country_total VARCHAR2(512) NULL, + + company_total VARCHAR2(512) NULL, + + adjustment_total VARCHAR2(512) NULL, + + adjust_to NUMBER(20,0) NULL, + + bill_month VARCHAR2(30) NULL, + + creator NUMBER(20,0) NULL, + + delete_type NUMBER(11,0) NULL, + + create_time DATE DEFAULT sysdate, + + update_time DATE DEFAULT sysdate, + + tenant_key VARCHAR2(10) NULL, + +PRIMARY KEY ( id ) + +); +/ + +CREATE TABLE hrsa_compensation_config ( + + id NUMBER(20,0) NOT NULL, + + payment_agency NUMBER(20,0) NULL, + + payment_organization NUMBER(20,0) NULL, + + employee_id NUMBER(20,0) NULL, + + welfare_type NUMBER(11,0) NULL, + + category_type VARCHAR2(100) NULL, + + adjust_to NUMBER(20,0) NULL, + + creator NUMBER(20,0) NULL, + + delete_type NUMBER(11,0) NULL, + + create_time DATE DEFAULT sysdate, + + update_time DATE DEFAULT sysdate, + + tenant_key VARCHAR2(10) NULL, + +PRIMARY KEY ( id ) + +); +/ + diff --git a/resource/sqlupgrade/ST/sql202212081003.sql b/resource/sqlupgrade/ST/sql202212081003.sql new file mode 100644 index 000000000..c1a028dd4 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202212081003.sql @@ -0,0 +1,61 @@ +create table HRSA_SALARY_SEND_RANGE +( + ID NUMBER(38) not null + primary key, + SALARY_SEND_ID NUMBER(38), + GRANT_TYPE VARCHAR2(64), + CREATE_TIME TIMESTAMP(6) default sysdate, + CREATOR NUMBER(38), + UPDATE_TIME TIMESTAMP(6) default sysdate, + DELETE_TYPE NUMBER(11) default 0, + TENANT_KEY VARCHAR2(10) +); +/ + +create sequence HRSA_S_S_R_ID +start with 1 +increment by 1 +nomaxvalue +nocycle +nocache; +/ + +CREATE TRIGGER HRSA_S_S_R_TRIGGER +before INSERT ON HRSA_SALARY_SEND_RANGE FOR each ROW WHEN (NEW.ID IS NULL) +BEGIN +SELECT HRSA_S_S_R_ID.nextval into:NEW.ID from dual; +END; +/ + +create table HRSA_SALARY_SEND_RANGE_OBJ +( + ID NUMBER(38) not null + primary key, + SALARY_SEND_ID NUMBER(38) not null, + SALARY_SEND_RANGE_ID NUMBER(38) not null, + RANGE_TYPE NUMBER(11) not null, + TARGET_TYPE NUMBER(11) not null, + TARGET_ID NUMBER(38) not null, + CREATOR NUMBER(38), + CREATE_TIME DATE default sysdate, + UPDATE_TIME DATE default sysdate, + DELETE_TYPE NUMBER(11) default 0, + TENANT_KEY VARCHAR2(10) +); +/ + +create sequence HRSA_S_S_R_O_ID +start with 1 +increment by 1 +nomaxvalue +nocycle +nocache; +/ + +CREATE TRIGGER HRSA_S_S_R_O_TRIGGER +before INSERT ON HRSA_SALARY_SEND_RANGE_OBJ FOR each ROW WHEN (NEW.ID IS NULL) +BEGIN +SELECT HRSA_S_S_R_O_ID.nextval into:NEW.ID from dual; +END; +/ + diff --git a/resource/sqlupgrade/ST/sql202212230103.sql b/resource/sqlupgrade/ST/sql202212230103.sql new file mode 100644 index 000000000..d59c8d288 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202212230103.sql @@ -0,0 +1,49 @@ +CREATE TABLE hrsa_salary_sob_back_item ( +id NUMBER(38,0) primary key NOT NULL, +salary_sob_id NUMBER(38,0) DEFAULT NULL NULL, +salary_item_id NUMBER(38,0) DEFAULT NULL NULL, +salary_item_code VARCHAR2(255) DEFAULT NULL NULL, +data_type VARCHAR2(255) DEFAULT NULL NULL, +rounding_mode NUMBER(38,0) DEFAULT NULL NULL, +pattern NUMBER(38,0) DEFAULT NULL NULL, +value_type NUMBER(38,0) DEFAULT NULL NULL, +formula_id NUMBER(38,0) DEFAULT NULL NULL, +back_calc_type NUMBER(38,0) DEFAULT NULL NULL, +tenant_key VARCHAR2(255) DEFAULT NULL NULL, +creator NUMBER(38,0) DEFAULT NULL NULL, +delete_type NUMBER(38,0) DEFAULT NULL NULL, +create_time DATE DEFAULT sysdate, +update_time DATE DEFAULT sysdate +); +/ + +alter table hrsa_salary_acct_record add back_calc_status NUMBER(38,0) null; +/ + +alter table hrsa_salary_acct_result add origin_result_value VARCHAR2(1000) null; +/ + +alter table hrsa_salary_acct_result_report add origin_result_value VARCHAR2(1000) null; +/ + +alter table hrsa_salary_send add salary_acct_type NUMBER(38,0) null; +/ + +alter table hrsa_salary_send add send_status NUMBER(38,0) null; +/ + +alter table hrsa_salary_send_info add salary_acct_type NUMBER(38,0) null; +/ + +alter table hrsa_salary_template add replenish_name VARCHAR2(100) null; +/ + +alter table hrsa_salary_template add replenish_rule VARCHAR2(255) null; +/ + +alter table hrsa_salary_template add replenish_salary_item_setting CLOB null; +/ + +alter table hrsa_acct_result_temp add origin_result_value VARCHAR2(1000) null; +/ + diff --git a/resource/sqlupgrade/ST/sql202301310403.sql b/resource/sqlupgrade/ST/sql202301310403.sql new file mode 100644 index 000000000..3ae549a43 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202301310403.sql @@ -0,0 +1,93 @@ +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629577, 'ս', 'annualIncome', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629578, 'ս˰', 'annualTaxRate', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1675043440772, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629579, 'ս۳', 'annualQuickDeductionFactor', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1674894163247, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629580, 'սӦ˰', 'annualTax', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1674896933031, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629581, 'Ӧս', 'annualPayable', 1, 7, 1, 0, 0, 2, 2, 2, 0, 1674897014605, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629600, 'ս˰', 'annualTaxFreeIncome', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629601, 'ս', 'annualOther', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629602, '׼۳ľս', 'annualDonateTax', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629603, '˰ս', 'annualTaxSavings', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629604, 'עս', 'annualRemark', 1, 7, 1, 0, 0, 2, 2, 1, 0, 0, ' ', 1, 1, 0, 0, 'all_teams', to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 'string'); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845590, 2, 746777981115629577, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 0); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845591, 2, 746777981115629578, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 1); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845592, 2, 746777981115629579, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 2); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845593, 2, 746777981115629580, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 3); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845595, 2, 746777981115629600, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 4); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845596, 2, 746777981115629601, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 5); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845597, 2, 746777981115629602, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 6); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845598, 2, 746777981115629603, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 7); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845599, 2, 746777981115629604, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 8); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845594, 2, 746777981115629581, 1, 0, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 0, 9); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1674894163247, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', 'if({нĿ.ս}<=36000){0;}else if({нĿ.ս}<=144000){210;}else if({нĿ.ս}<=300000){1410;}else if({нĿ.ս}<=420000){2660;}else if({нĿ.ս}<=660000){4410;}else if({нĿ.ս}<=960000){7160;}else{15160;}', 'if(salaryItem_annualIncome<=36000){0;}else if(salaryItem_annualIncome<=144000){210;}else if(salaryItem_annualIncome<=300000){1410;}else if(salaryItem_annualIncome<=420000){2660;}else if(salaryItem_annualIncome<=660000){4410;}else if(salaryItem_annualIncome<=960000){7160;}else{15160;}', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1674896933031, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{нĿ.ս}*{нĿ.ս˰}-{нĿ.ս۳}', 'salaryItem_annualIncome*salaryItem_annualTaxRate-salaryItem_annualQuickDeductionFactor', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1674897014605, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{нĿ.ս}-{нĿ.սӦ˰}', 'salaryItem_annualIncome-salaryItem_annualTax', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1675043440772, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', 'if({нĿ.ս}<=0){0;}else if({нĿ.ս}<=36000){0.03;}else if({нĿ.ս}<=144000){0.1;}else if({нĿ.ս}<=300000){0.2;}else if({нĿ.ս}<=420000){0.25;}else if({нĿ.ս}<=660000){0.3;}else if({нĿ.ս}<=960000){0.35;}else{0.45;}', 'if(salaryItem_annualIncome<=0){0;}else if(salaryItem_annualIncome<=36000){0.03;}else if(salaryItem_annualIncome<=144000){0.1;}else if(salaryItem_annualIncome<=300000){0.2;}else if(salaryItem_annualIncome<=420000){0.25;}else if(salaryItem_annualIncome<=660000){0.3;}else if(salaryItem_annualIncome<=960000){0.35;}else{0.45;}', 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674894163265, 'ս', 1674894163247, 'salaryItem_annualIncome', '{нĿ.ս}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674896933036, 'ս', 1674896933031, 'salaryItem_annualIncome', '{нĿ.ս}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674896933041, 'ս˰', 1674896933031, 'salaryItem_annualTaxRate', '{нĿ.ս˰}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674896933045, 'ս۳', 1674896933031, 'salaryItem_annualQuickDeductionFactor', '{нĿ.ս۳}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674897014622, 'ս', 1674897014605, 'salaryItem_annualIncome', '{нĿ.ս}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1674897014626, 'սӦ˰', 1674897014605, 'salaryItem_annualTax', '{нĿ.սӦ˰}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1675043440796, 'ս', 1675043440772, 'salaryItem_annualIncome', '{нĿ.ս}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss'), to_date('2022-03-28 10:32:59','yyyy-MM-dd HH24:mi:ss')); +/ + diff --git a/resource/sqlupgrade/ST/sql202302060801.sql b/resource/sqlupgrade/ST/sql202302060801.sql new file mode 100644 index 000000000..cf85fb637 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202302060801.sql @@ -0,0 +1,47 @@ +delete from HtmlLabelIndex where id = 540871 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 540871,'' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 540871 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 540871 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540871 as indexid ,'' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540871 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 540871 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540871 as indexid ,'file management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540871 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 540871 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540871 as indexid ,'n' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540871 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelIndex where id = 540869 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 540869,'ֶι' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 540869 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 540869 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540869 as indexid ,'ֶι' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540869 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 540869 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540869 as indexid ,'Field management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540869 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 540869 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 540869 as indexid ,'ֶι' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 540869 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202302060902.sql b/resource/sqlupgrade/ST/sql202302060902.sql new file mode 100644 index 000000000..183a14737 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202302060902.sql @@ -0,0 +1,44 @@ +Delete from LeftMenuInfo where id=100125; +/ + +Delete from LeftMenuConfig where infoid=100125; +/ + +call LMConfig_U_ByInfoInsert (2,100118,2); +/ + +call LMInfo_Insert (100125,538004,'','',2,100118,2,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='' where id = 100125; +/ + +Delete from LeftMenuInfo where id=100185; +/ + +Delete from LeftMenuConfig where infoid=100185; +/ + +call LMConfig_U_ByInfoInsert (2,100125,0); +/ + +call LMInfo_Insert (100185,540871,'','',2,100125,0,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/salaryFile' where id = 100185; +/ + +Delete from LeftMenuInfo where id=100184; +/ + +Delete from LeftMenuConfig where infoid=100184; +/ + +call LMConfig_U_ByInfoInsert (2,100125,-1); +/ + +call LMInfo_Insert (100184,540869,'','',2,100125,-1,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/fieldManagement' where id = 100184; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202302090303.sql b/resource/sqlupgrade/ST/sql202302090303.sql new file mode 100644 index 000000000..535e67877 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202302090303.sql @@ -0,0 +1,9 @@ +ALTER TABLE hrsa_scheme_detail ADD payment_cycle NUMBER(11,0) NULL; +/ + +ALTER TABLE hrsa_scheme_detail ADD account_type NUMBER(11,0) NULL; +/ + +ALTER TABLE hrsa_scheme_detail ADD cycle_setting VARCHAR2(255) NULL; +/ + diff --git a/resource/sqlupgrade/ST/sql202303130101.sql b/resource/sqlupgrade/ST/sql202303130101.sql new file mode 100644 index 000000000..671629174 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202303130101.sql @@ -0,0 +1,23 @@ +delete from HtmlLabelIndex where id = 541290 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 541290,'ϵͳԱ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 541290 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 541290 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 541290 as indexid ,'ϵͳԱ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 541290 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 541290 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 541290 as indexid ,'Non-system personnel management' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 541290 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 541290 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 541290 as indexid ,'ϵyˆT' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 541290 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202303130202.sql b/resource/sqlupgrade/ST/sql202303130202.sql new file mode 100644 index 000000000..9038f9cd1 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202303130202.sql @@ -0,0 +1,14 @@ +Delete from LeftMenuInfo where id=100186; +/ + +Delete from LeftMenuConfig where infoid=100186; +/ + +call LMConfig_U_ByInfoInsert (2,100118,9); +/ + +call LMInfo_Insert (100186,541290,'','',2,100118,9,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/externalPersonManage' where id = 100186; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202303150403.sql b/resource/sqlupgrade/ST/sql202303150403.sql new file mode 100644 index 000000000..1de44bdc4 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202303150403.sql @@ -0,0 +1,74 @@ +ALTER TABLE hrsa_tax_agent_emp ADD employee_type number; +/ + +ALTER TABLE hrsa_salary_archive ADD employee_type number; +/ + +ALTER TABLE hrsa_tax_agent_emp_change ADD employee_type number; +/ + +ALTER TABLE hrsa_salary_acct_emp ADD employee_type number; +/ + +ALTER TABLE hrsa_salary_send_info ADD employee_type number; +/ + +CREATE TABLE hrsa_external_employee +( + id NUMBER(38,0) primary key NOT NULL, + username varchar2(200) DEFAULT '', + department_name varchar2(200) DEFAULT '', + department_id NUMBER(38,0) DEFAULT 0, + subcompany_name varchar2(200) DEFAULT '', + subcompany_id NUMBER(38,0) DEFAULT 0, + jobtitle_name varchar2(200) DEFAULT '', + jobtitle_id NUMBER(38,0) DEFAULT 0, + companystartdate varchar2(200) DEFAULT '', + mobile varchar2(20) DEFAULT '', + status varchar2(10) DEFAULT '', + workcode varchar2(200) DEFAULT '', + sex varchar2(10) DEFAULT '', + email varchar2(200) DEFAULT '', + telephone varchar2(200) DEFAULT '', + jobcall varchar2(200) DEFAULT '', + birthday varchar2(200) DEFAULT '', + id_no varchar2(200) DEFAULT '', + bank_card_num varchar2(200) DEFAULT '', + bank_name varchar2(200) DEFAULT '', + delete_type number DEFAULT 0, + creator NUMBER(38,0) DEFAULT 0, + modifier NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + tenant_key varchar2(200) DEFAULT '' +); +/ + +CREATE TABLE hrsa_salary_sob_ext_range +( + id NUMBER(38,0) primary key NOT NULL, + salary_sob_id NUMBER(38,0) DEFAULT 0, + target_type NUMBER(38,0) DEFAULT 0, + target_id NUMBER(38,0) DEFAULT 0, + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(200) DEFAULT '' +); +/ + +CREATE TABLE hrsa_tax_agent_ext_range +( + id NUMBER(38,0) primary key NOT NULL, + tax_agent_id NUMBER(38,0) DEFAULT 0, + target_type NUMBER(38,0) DEFAULT 0, + target_id NUMBER(38,0) DEFAULT 0, + creator NUMBER(38,0) DEFAULT 0, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + delete_type number DEFAULT 0, + tenant_key varchar2(200) DEFAULT '' +); +/ + diff --git a/resource/sqlupgrade/ST/sql202304040503.sql b/resource/sqlupgrade/ST/sql202304040503.sql new file mode 100644 index 000000000..8616fd57d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202304040503.sql @@ -0,0 +1,67 @@ +ALTER TABLE hrsa_other_deduction ADD ( + private_pension varchar2(255) NULL +); +/ + +ALTER TABLE hrsa_add_up_situation ADD ( + add_up_private_pension varchar2(255) NULL +); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629605, 'Ͻ', 'privatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1680746056549, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_sys_salary_item(id, name, code, system_type, category, item_type, use_default, use_in_employee_salary, rounding_mode, pattern, value_type, datasource, formula_id, description, can_edit, can_delete, creator, delete_type, tenant_key, create_time, update_time, data_type) VALUES (746777981115629698, 'ۼƸϽ', 'addUpPrivatePension', 1, 2, 12, 0, 0, 2, 2, 2, 8, 1681201555316, '', 0, 1, 0, 0, 'all_teams', to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 'number'); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1680746056549, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{˰۳.Ͻ}', 'otherDeduction_privatePension', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1680746056577, 'Ͻ', 1680746056549, 'otherDeduction_privatePension', '{˰۳.Ͻ}', 'number', 'otherDeduction', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1681201555316, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"sqlReturnKey":"","openDecrypt":"0","datasource":{"datasourceId":""}}', '{нĿ.Ͻ}+{ۼ.ۼƸϽ}', 'salaryItem_privatePension addUpSituation_addUpPrivatePension', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681201555332, 'Ͻ', 1681201555316, 'salaryItem_privatePension', '{нĿ.Ͻ}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681201555338, 'ۼƸϽ', 1681201555316, 'addUpSituation_addUpPrivatePension', '{ۼ.ۼƸϽ}', 'number', 'addUpSituation', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845610, 1, 746777981115629605, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 10); +/ + +INSERT INTO hrsa_salary_sob_default_item(id, income_category, sys_salary_item_id, can_edit, can_delete, creator, create_time, update_time, delete_type, tenant_key, sob_default_item_group_id, sorted_index) VALUES (733975748932845611, 1, 746777981115629698, 1, 0, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), 0, 'all_teams', 703433961629614110, 11); +/ + +INSERT INTO hrsa_formula(id, name, description, module, use_for, reference_type, return_type, validate_type, extend_param, formula, formulaRunScript, creator, delete_type, create_time, update_time) VALUES (1681265757380, 'ʽ1', 'ע', 'salary', 'salaryitem', 'formula', 'number', 'number', '{"datasource":{"datasourceId":""}}', '{нĿ.ǰۼӦ˰ϼ}-{нĿ.ǰۼר۳ϼ}-{нĿ.ǰۼרӿ۳ϼ}-{нĿ.ǰۼ۳ϼ}-{нĿ.ǰۼƼ}-{нĿ.ǰۼ׼۳ľ}-{нĿ.ۼƸϽ}', 'salaryItem_addUpIncome-salaryItem_addUpSpecialDeduction-salaryItem_addUpSpeAddiDeduction-salaryItem_addUpOtherDeduction-salaryItem_addUpSubtraction-salaryItem_addUpAllowedDonation-salaryItem_addUpPrivatePension', 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757404, 'ǰۼ׼۳ľ', 1681265757380, 'salaryItem_addUpAllowedDonation', '{нĿ.ǰۼ׼۳ľ}', 'number', 'salaryItem', 5, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757408, 'ǰۼƼ', 1681265757380, 'salaryItem_addUpSubtraction', '{нĿ.ǰۼƼ}', 'number', 'salaryItem', 4, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757413, 'ǰۼ۳ϼ', 1681265757380, 'salaryItem_addUpOtherDeduction', '{нĿ.ǰۼ۳ϼ}', 'number', 'salaryItem', 3, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757417, 'ǰۼרӿ۳ϼ', 1681265757380, 'salaryItem_addUpSpeAddiDeduction', '{нĿ.ǰۼרӿ۳ϼ}', 'number', 'salaryItem', 2, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757421, 'ǰۼר۳ϼ', 1681265757380, 'salaryItem_addUpSpecialDeduction', '{нĿ.ǰۼר۳ϼ}', 'number', 'salaryItem', 1, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757424, 'ǰۼӦ˰ϼ', 1681265757380, 'salaryItem_addUpIncome', '{нĿ.ǰۼӦ˰ϼ}', 'number', 'salaryItem', 0, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +INSERT INTO hrsa_formula_var(id, name, formula_id, field_id, field_name, field_type, source, order_index, creator, delete_type, create_time, update_time) VALUES (1681265757428, 'ۼƸϽ', 1681265757380, 'salaryItem_addUpPrivatePension', '{нĿ.ۼƸϽ}', 'number', 'salaryItem', 6, 92, 0, to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss'), to_date('2022-05-10 16:03:02','yyyy-MM-dd HH24:mi:ss')); +/ + +update hrsa_sys_salary_item set formula_id = 1681265757380 where name = 'ǰۼӦ˰ö'; +/ + +update hrsa_salary_item set formula_id = 1681265757380 where name = 'ǰۼӦ˰ö'; +/ + diff --git a/resource/sqlupgrade/ST/sql202304260103.sql b/resource/sqlupgrade/ST/sql202304260103.sql new file mode 100644 index 000000000..506536bc3 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202304260103.sql @@ -0,0 +1,3 @@ +update hrsa_sys_salary_item set use_in_employee_salary = 1 where code in ('baseSalary','postSalary'); +/ + diff --git a/resource/sqlupgrade/ST/sql202304270203.sql b/resource/sqlupgrade/ST/sql202304270203.sql new file mode 100644 index 000000000..21b752ab7 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202304270203.sql @@ -0,0 +1,245 @@ +create table hrsa_sub_table +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + sub_table_name varchar2(100) not null, + dimension varchar2(20) not null, + start_month varchar2(10), + end_month varchar2(10), + pay_org_string varchar2(500), + pay_agency_string varchar2(500), + sub_company_string varchar2(500), + depart_string varchar2(500), + grade_string varchar2(500), + position_string varchar2(500), + status_string varchar2(500), + employee_type varchar2(500), + employee_string varchar2(500), + payment_type_string varchar2(100) +); +/ + +create table hrsa_sub_table_item +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + table_id number not null, + item_name varchar2(50) not null, + item_value varchar2(500) not null, + index_value int not null, + total_rule varchar2(500), + count_rule varchar2(500), + unit_type int default 2 +); +/ + +alter table hrsa_sub_table add table_type int; +/ + +alter table hrsa_sub_table modify table_type default 0; +/ + +create table hrsa_salary_stats_dim +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + dim_name varchar2(100), + dim_type varchar2(20), + remark varchar2(500), + setting varchar2(2000), + is_default int, + dim_code varchar2(50) +); +/ + +create table hrsa_salary_stats_report +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + report_name varchar2(100), + dimension varchar2(1000), + tax_agent_setting varchar2(1000), + income_category_setting varchar2(20), + sub_company_setting varchar2(1000), + depart_setting varchar2(1000), + grade_setting varchar2(1000), + position_setting varchar2(1000), + status_setting varchar2(1000), + employee_setting varchar2(1000), + hiredate_setting varchar2(1000), + leavedate_setting varchar2(1000), + salary_start_month date, + salary_end_month date +); +/ + +create table hrsa_salary_statistics_item +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + item_name varchar2(50), + item_value varchar2(1000), + count_rule varchar2(500), + sum_rule varchar2(500), + avg_rule varchar2(500), + max_rule varchar2(500), + min_rule varchar2(500), + median_rule varchar2(500), + index_value int, + unit_type int, + stat_report_id number +); +/ + +create table hrsa_charts_setting +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + table_id number not null, + charts_type int not null, + item_values varchar2(500), + item_col_value varchar2(50) not null, + dimension_range int not null, + item_sort_value varchar2(500), + item_col_sort_value varchar2(50), + sort_type int, + sort_num int +); +/ + +create table hrsa_salary_echarts_setting +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + report_id number not null, + charts_type int not null, + item_values varchar2(500), + item_col_value varchar2(50) not null, + dimension_range int not null, + item_sort_value varchar2(500), + item_col_sort_value varchar2(50), + sort_type int, + sort_num int +); +/ + +alter table hrsa_salary_stats_dim modify dim_type varchar2(30); +/ + +alter table hrsa_salary_stats_report modify income_category_setting varchar2(1000); +/ + +create table hrsa_statreportlogs_detail +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + uuid varchar2(36) not null, + mainid varchar2(36) not null, + dataid varchar2(50) not null, + belongdataid varchar2(50) not null, + tablename varchar2(200) not null, + tablenamelabelid varchar2(50) default '-1' not null, + tablenamedesc varchar2(50) not null, + fieldname varchar2(200) not null, + fieldnamelabelid varchar2(50) default '-1' not null, + newvalue clob not null, + oldvalue clob not null, + newrealvalue clob not null, + oldrealvalue clob not null, + fielddesc varchar2(200) not null, + showorder int not null, + isdetail int default 0 not null +); +/ + +create table hrsa_statreportlogs +( + id number primary key , + create_time date, + update_time date, + creator number, + delete_type int default 0, + tenant_key varchar2(10), + uuid varchar2(36) not null, + log_date date not null, + device varchar2(500) not null, + log_operator number not null, + operatorname varchar2(100), + targetid number default '-1' not null, + targetname clob not null, + modulename varchar2(100) not null, + functionname varchar2(100) not null, + interfacename varchar2(100) not null, + requesturl varchar2(200) not null, + requesturi varchar2(200) not null, + operatetype varchar2(50) not null, + operatetypename varchar2(100) not null, + operatedesc varchar2(3000) not null, + params clob not null, + belongmainid varchar2(36) not null, + clientip varchar2(50) not null, + groupid varchar2(50) not null, + groupnamelabel varchar2(1000) not null, + redoservice varchar2(200) not null, + redocontext clob not null, + cancelservice varchar2(200) not null, + cancelcontext clob not null, + totalruntime number default '0' not null, + mainruntime number default '0' not null, + log_result varchar2(100) not null, + fromterminal varchar2(100) not null, + resultdesc clob not null, + old_content varchar2(3000) not null, + link_type varchar2(20) not null, + link_id number default '0' not null, + old_link_id number default '0' not null +); +/ + +alter table hrsa_salary_stats_report add remark varchar2(100); +/ + +alter table hrsa_salary_stats_report add second_dimension varchar2(100); +/ + +alter table hrsa_salary_stats_report add sort_index varchar2(100); +/ + +alter table hrsa_salary_stats_report add sort_type varchar2(100); +/ + +alter table hrsa_salary_stats_dim add label_id int; +/ + diff --git a/resource/sqlupgrade/ST/sql202304270303.sql b/resource/sqlupgrade/ST/sql202304270303.sql new file mode 100644 index 000000000..673df6c04 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202304270303.sql @@ -0,0 +1,12 @@ +declare +datashowset_id NUMBER; +hrmjobgroups_id NUMBER; +begin +INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryItemBrowser', '1', '1', '', 'select * from hrsa_salary_item where delete_type = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, 'нĿ', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0',SYS_GUID(), '', '', '', '', '1', 0, 1); +SELECT max(id) INTO datashowset_id FROM DATASHOWSET; +INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryItemBrowser', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL); +INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '', 'name', '', 1, 1, SYS_GUID(), NULL); +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '', 'name', '2', '', 1, SYS_GUID(), ''); +end; +/ + diff --git a/resource/sqlupgrade/ST/sql202304270501.sql b/resource/sqlupgrade/ST/sql202304270501.sql new file mode 100644 index 000000000..5f3f359c9 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202304270501.sql @@ -0,0 +1,23 @@ +delete from HtmlLabelIndex where id = 542781 and ( trim(indexdesc) is null ) ; +/ + +insert into HtmlLabelIndex(id,indexdesc) select 542781,'нͳƱ' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 542781 and ( trim(indexdesc) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 542781 and languageid=7 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 542781 as indexid ,'нͳƱ' as content,7 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 542781 and languageid=7 and ( trim(labelname) is not null )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 542781 and languageid=8 and ( trim(labelname) is null or length(labelname)!=lengthb(labelname) ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 542781 as indexid ,'Salary Statistics Report' as content,8 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 542781 and languageid=8 and ( trim(labelname) is not null and length(labelname)=lengthb(labelname) )) and rownum = 1 ; +/ + +delete from HtmlLabelInfo where indexid = 542781 and languageid=9 and ( trim(labelname) is null ) ; +/ + +insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select 542781 as indexid ,'нyӋ' as content,9 as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 542781 and languageid=9 and ( trim(labelname) is not null )) and rownum = 1 ; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202305050302.sql b/resource/sqlupgrade/ST/sql202305050302.sql new file mode 100644 index 000000000..4264b16d2 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202305050302.sql @@ -0,0 +1,14 @@ +Delete from LeftMenuInfo where id=100187; +/ + +Delete from LeftMenuConfig where infoid=100187; +/ + +call LMConfig_U_ByInfoInsert (2,100118,9); +/ + +call LMInfo_Insert (100187,542781,'','',2,100118,9,18); +/ + +update LeftMenuInfo set mobxrouteurl = '',iconClassName = '',fullrouteurl='/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics' where id = 100187; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202305170903.sql b/resource/sqlupgrade/ST/sql202305170903.sql new file mode 100644 index 000000000..2ab9370a5 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202305170903.sql @@ -0,0 +1,14 @@ +CREATE TABLE hrsa_salary_acct_result_log ( + id NUMBER(38,0) NOT NULL, + datasource NUMBER NOT NULL, + salary_acct_record_id NUMBER(38,0) NOT NULL, + salary_acct_result_id NUMBER(38,0) NOT NULL, + salary_acct_emp_id NUMBER(38,0) NOT NULL, + salary_item_id NUMBER(38,0) NOT NULL, + employee_id NUMBER(38,0) NOT NULL, + operator NUMBER(38,0) NOT NULL, + operate_time DATE NOT NULL, + delete_type NUMBER NOT NULL, + update_time DATE NOT NULL +); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202306020403.sql b/resource/sqlupgrade/ST/sql202306020403.sql new file mode 100644 index 000000000..066cd2785 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202306020403.sql @@ -0,0 +1,2 @@ +alter table HRSA_SALARY_ITEM add sorted_index number(11) null; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202306020603.sql b/resource/sqlupgrade/ST/sql202306020603.sql new file mode 100644 index 000000000..2647c87eb --- /dev/null +++ b/resource/sqlupgrade/ST/sql202306020603.sql @@ -0,0 +1,7 @@ +ALTER TABLE hrsa_salary_template ADD ( + sms_status int NULL +); +/ + +UPDATE hrsa_salary_template SET msg_status = 1; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202306080103.sql b/resource/sqlupgrade/ST/sql202306080103.sql new file mode 100644 index 000000000..2ec6df974 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202306080103.sql @@ -0,0 +1,2 @@ +alter table HRSA_TAX_AGENT add SORTED_INDEX number(11) null; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202306200203.sql b/resource/sqlupgrade/ST/sql202306200203.sql new file mode 100644 index 000000000..57aa8be6d --- /dev/null +++ b/resource/sqlupgrade/ST/sql202306200203.sql @@ -0,0 +1,5 @@ +update hrsa_formula set formula = '{нĿ.£Σ۳ϼ}+{ۼ.ۼ˰۳}' , formulaRunScript='salaryItem_otherDeduction addUpSituation_addUpOtherDeduction' where id = 1651740238860; +/ + +update hrsa_formula_var set delete_type = 1 where id = 1651740241717; +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202306260103.sql b/resource/sqlupgrade/ST/sql202306260103.sql new file mode 100644 index 000000000..b34daa89a --- /dev/null +++ b/resource/sqlupgrade/ST/sql202306260103.sql @@ -0,0 +1,13 @@ +CREATE TABLE hrsa_salary_bill_watermark +( +id NUMBER(38,0) PRIMARY KEY NOT NULL, +watermark_status NUMBER NULL, +watermark_type VARCHAR2(255) NULL, +watermark_setting CLOB NULL, +create_time DATE DEFAULT sysdate, +update_time DATE DEFAULT sysdate, +creator NUMBER(38,0) NOT NULL, +delete_type NUMBER NOT NULL, +tenant_key VARCHAR2(255) +); +/ \ No newline at end of file diff --git a/resource/sqlupgrade/ST/sql202307100103.sql b/resource/sqlupgrade/ST/sql202307100103.sql new file mode 100644 index 000000000..ffdfcf84f --- /dev/null +++ b/resource/sqlupgrade/ST/sql202307100103.sql @@ -0,0 +1,16 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + diff --git a/resource/sqlupgrade/ST/sql202307170403.sql b/resource/sqlupgrade/ST/sql202307170403.sql new file mode 100644 index 000000000..bc59c53ae --- /dev/null +++ b/resource/sqlupgrade/ST/sql202307170403.sql @@ -0,0 +1,24 @@ +alter table hrsa_salary_send_info +add bill_read_status NUMBER null; +/ + +alter table hrsa_salary_send_info +add bill_confirm_status NUMBER null; +/ + +alter table hrsa_salary_send_info +add send_employee_id NUMBER(38,0) NULL; +/ + +alter table hrsa_salary_template +add ack_feedback_status NUMBER NULL; +/ + +alter table hrsa_salary_template +add auto_ack_days NUMBER NULL; +/ + +alter table hrsa_salary_template +add feedback_url VARCHAR2(500) NULL; +/ + diff --git a/resource/sqlupgrade/ST/sql202307180603.sql b/resource/sqlupgrade/ST/sql202307180603.sql new file mode 100644 index 000000000..9154924fe --- /dev/null +++ b/resource/sqlupgrade/ST/sql202307180603.sql @@ -0,0 +1,4 @@ +alter table hrsa_salary_item + add hide_default NUMBER null; +/ + diff --git a/resource/sqlupgrade/ST/sql202307200603.sql b/resource/sqlupgrade/ST/sql202307200603.sql new file mode 100644 index 000000000..849cc35dc --- /dev/null +++ b/resource/sqlupgrade/ST/sql202307200603.sql @@ -0,0 +1,14 @@ +declare +datashowset_id NUMBER; +hrmjobgroups_id NUMBER; +begin +INSERT INTO datashowset(SHOWNAME, SHOWCLASS, DATAFROM, DATASOURCEID, SQLTEXT, WSURL, WSOPERATION, XMLTEXT, INPARA, SHOWTYPE, KEYFIELD, PARENTFIELD, SHOWFIELD, DETAILPAGEURL, TYPENAME, SELECTTYPE, SHOWPAGEURL, BROWSERFROM, NAME, CUSTOMID, CUSTOMHREF, SQLTEXT1, SQLTEXT2, NAMEHEADER, DESCRIPTIONHEADER, WSWORKNAME, SEARCHBYID, CREATEDATE, CREATETIME, MODIFYDATE, MODIFYTIME, SEARCHBYNAME, onlylowestnode, characterset, uuid, isSupportPaging, ESBID, ESBSHOWID, mobiledetailpageurl, isPhyPage, subcompanyid, unconditionalQuery) VALUES ('salaryExtEmp', '1', '1', '', 'SELECT * FROM hrsa_external_employee where delete_type=0', '', '', '', '', '1','id', '', '', '', '', '', '', 2, 'нϵͳԱ', NULL, '', NULL, NULL, NULL, NULL, '', '', TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL, '', '', '0', SYS_GUID(), '', '', '', '', '1', 0, 1); +SELECT max(id) INTO datashowset_id FROM DATASHOWSET; +INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('salaryExtEmp', '0', 0, TO_CHAR(SYSDATE,'yyyy-MM-dd'), TO_CHAR(SYSDATE,'HH24:mm:ss'), NULL, NULL); +INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, '', 'username', '', 1, 1, SYS_GUID(), NULL); +INSERT INTO datashowparam(MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES (datashowset_id, 'ֻ', 'mobile', '', 0, 2, SYS_GUID(), NULL); +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, '', 'username', '2', '', 1, SYS_GUID(), ''); +INSERT INTO datasearchparam(MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES (datashowset_id, 'ֻ', 'mobile', '2', '', 2, SYS_GUID(), ''); +end; +/ + diff --git a/resource/sqlupgrade/ST/sql202308080403.sql b/resource/sqlupgrade/ST/sql202308080403.sql new file mode 100644 index 000000000..df4bb57b5 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202308080403.sql @@ -0,0 +1,12 @@ +alter table hrsa_salary_sob_item + add rounding_mode NUMBER null; +/ + +alter table hrsa_salary_sob_item + add pattern NUMBER null; +/ + +alter table hrsa_salary_sob_item + add value_type NUMBER null; +/ + diff --git a/resource/sqlupgrade/ST/sql202308080503.sql b/resource/sqlupgrade/ST/sql202308080503.sql new file mode 100644 index 000000000..771c36cba --- /dev/null +++ b/resource/sqlupgrade/ST/sql202308080503.sql @@ -0,0 +1,14 @@ +CREATE TABLE hrsa_salary_bill_item_name( + id NUMBER(38,0) PRIMARY KEY NOT NULL, + salary_template_id NUMBER(38,0) NOT NULL, + salary_item_id NUMBER(38,0) NOT NULL, + salary_item_show_name VARCHAR2(255) NOT NULL, + salary_bill_type NUMBER NOT NULL, + create_time DATE DEFAULT sysdate, + update_time DATE DEFAULT sysdate, + creator NUMBER(38,0) NOT NULL, + delete_type NUMBER NOT NULL, + tenant_key VARCHAR2(255) +); +/ + diff --git a/resource/sqlupgrade/ST/sql202308090203.sql b/resource/sqlupgrade/ST/sql202308090203.sql index ee8394990..77df3748e 100644 --- a/resource/sqlupgrade/ST/sql202308090203.sql +++ b/resource/sqlupgrade/ST/sql202308090203.sql @@ -10,7 +10,7 @@ alter table hrsa_social_archives drop column employee_id; alter table hrsa_social_archives rename column employee_id2 to employee_id; / -alter table hrsa_social_archives MODIFY (employee_id not null); +alter table hrsa_social_archives MODIFY employee_id not null; / ALTER Table hrsa_fund_archives Add employee_id2 NUMBER(38,0); @@ -25,7 +25,7 @@ alter table hrsa_fund_archives drop column employee_id; alter table hrsa_fund_archives rename column employee_id2 to employee_id; / -alter table hrsa_fund_archives MODIFY (employee_id not null); +alter table hrsa_fund_archives MODIFY employee_id not null; / ALTER Table hrsa_other_archives Add employee_id2 NUMBER(38,0); @@ -40,7 +40,7 @@ alter table hrsa_other_archives drop column employee_id; alter table hrsa_other_archives rename column employee_id2 to employee_id; / -alter table hrsa_other_archives MODIFY (employee_id not null); +alter table hrsa_other_archives MODIFY employee_id not null; / ALTER TABLE hrsa_insurance_base_info ADD employee_type number; diff --git a/resource/sqlupgrade/ST/sql202308170403.sql b/resource/sqlupgrade/ST/sql202308170403.sql new file mode 100644 index 000000000..c06c2bd26 --- /dev/null +++ b/resource/sqlupgrade/ST/sql202308170403.sql @@ -0,0 +1,9 @@ +update hrsa_salary_sob_item a set rounding_mode = (select rounding_mode from hrsa_salary_item b where b.delete_type=0 and b.id =a.salary_item_id) where a.delete_type=0 and (a.rounding_mode is null or a.rounding_mode=''); +/ + +update hrsa_salary_sob_item a set pattern = (select pattern from hrsa_salary_item b where b.delete_type=0 and b.id =a.salary_item_id) where a.delete_type=0 and (a.pattern is null or a.pattern=''); +/ + +update hrsa_salary_sob_item a set value_type = (select value_type from hrsa_salary_item b where b.delete_type=0 and b.id =a.salary_item_id) where a.delete_type=0 and (a.value_type is null or a.value_type=''); +/ + From bc21cc7a2e903d6e18b2dc16adb683d4b0d7150a Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 31 Aug 2023 14:18:00 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=B8=A6=E5=87=BA=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=8F=82=E8=80=83=E5=BD=93=E5=89=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/web/SISchemeController.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/com/engine/salary/web/SISchemeController.java b/src/com/engine/salary/web/SISchemeController.java index d751b0acc..bd175ee15 100644 --- a/src/com/engine/salary/web/SISchemeController.java +++ b/src/com/engine/salary/web/SISchemeController.java @@ -255,16 +255,8 @@ public class SISchemeController { @Produces(MediaType.APPLICATION_OCTET_STREAM) public Response exportTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response) { - InsuranceArchivesListParam param = new InsuranceArchivesListParam(); -// String ids = request.getParameter("ids"); -// if(StringUtils.isNotBlank(ids)){ -// param.setIds( Arrays.stream(ids.split(",")).map(Long::valueOf).collect(Collectors.toList())); -// } + InsuranceArchivesListParam param = buildInsuranceArchivesListParam(request); - String runStatuses = request.getParameter("runStatuses"); - if(StringUtils.isNotBlank(runStatuses)){ - param.setRunStatuses( Arrays.stream(runStatuses.split(",")).map(String::valueOf).collect(Collectors.toList())); - } param.setExportData(Boolean.valueOf(request.getParameter("exportData"))); param.setExtWelArchiveList(Boolean.valueOf(request.getParameter("extWelArchiveList"))); User user = HrmUserVarify.getUser(request, response); From feeb3d21f251dbd2a61021ec8cc78ce0a9eef170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 31 Aug 2023 14:39:58 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E5=85=AC=E5=BC=8F=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../formlua/entity/standard/ExcelResult.java | 14 +++++++++ .../salary/service/SalaryAcctCalcService.java | 31 ------------------- .../service/impl/FormulaRunServiceImpl.java | 29 ++++++++++++----- 3 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 src/com/engine/salary/service/SalaryAcctCalcService.java diff --git a/src/com/engine/salary/formlua/entity/standard/ExcelResult.java b/src/com/engine/salary/formlua/entity/standard/ExcelResult.java index c91dc89f5..2a6eb6428 100644 --- a/src/com/engine/salary/formlua/entity/standard/ExcelResult.java +++ b/src/com/engine/salary/formlua/entity/standard/ExcelResult.java @@ -37,6 +37,12 @@ public class ExcelResult implements Serializable { private String formulaId; private String dataType; + + /** + * 运行时间 + */ + private double runTime; + public ExcelResult() { } @@ -131,6 +137,14 @@ public class ExcelResult implements Serializable { this.status = status; } + public double getRunTime() { + return runTime; + } + + public void setRunTime(double runTime) { + this.runTime = runTime; + } + @Override public String toString() { return "ExcelResult{" + diff --git a/src/com/engine/salary/service/SalaryAcctCalcService.java b/src/com/engine/salary/service/SalaryAcctCalcService.java deleted file mode 100644 index 842622b3c..000000000 --- a/src/com/engine/salary/service/SalaryAcctCalcService.java +++ /dev/null @@ -1,31 +0,0 @@ -//package com.engine.salary.service; -// -//import com.engine.salary.entity.datacollection.DataCollectionEmployee; -// -//import java.util.Collection; -// -///** -// * @description: 薪资核算 -// * @author: xiajun -// * @modified By: xiajun -// * @date: Created in 8/22/22 3:15 PM -// * @version:v1.0 -// */ -//public interface SalaryAcctCalcService { -// -// /** -// * 按薪资核算记录id进行核算 -// * -// * @param salaryAcctRecordId -// * @param simpleEmployee -// */ -// void calcByRecordId(Long salaryAcctRecordId, DataCollectionEmployee simpleEmployee) throws Exception; -// -// /** -// * 按薪资核算人员id进行核算 -// * -// * @param salaryAcctEmployeeIds -// * @param simpleEmployee -// */ -// void calcByEmployeeIds(Long salaryAcctRecordId, Collection salaryAcctEmployeeIds, DataCollectionEmployee simpleEmployee) throws Exception; -//} diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java index b1d19353a..e53537e9c 100644 --- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java +++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java @@ -19,6 +19,7 @@ import com.ql.util.express.ExpressRunner; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.util.StopWatch; import weaver.conn.RecordSet; import weaver.conn.RecordSetDataSource; import weaver.general.BaseBean; @@ -45,15 +46,29 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService @Override public ExcelResult run(ExpressFormula expressFormula, List formulaVars, DataCollectionEmployee simpleEmployee) { - - if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.FORMULA) { - return runFormula(expressFormula, formulaVars); - } - if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.SQL) { - return runSQL(expressFormula, formulaVars); + ExcelResult result = new ExcelResult(false, "", ""); + if (isLog) { + StopWatch stopWatch = new StopWatch(); + stopWatch.start("run " + expressFormula.getName()); + if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.FORMULA) { + result = runFormula(expressFormula, formulaVars); + } + if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.SQL) { + result = runSQL(expressFormula, formulaVars); + } + stopWatch.stop(); + double totalTimeSeconds = stopWatch.getTotalTimeSeconds(); + result.setRunTime(totalTimeSeconds); + } else { + if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.FORMULA) { + result = runFormula(expressFormula, formulaVars); + } + if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.SQL) { + result = runSQL(expressFormula, formulaVars); + } } log.error("express execute fail, {} not in ReferenceTypeEnum ", expressFormula.getReferenceType()); - return new ExcelResult(false, "", ""); + return result; } private ExcelResult runSQL(ExpressFormula expressFormula, List formulaVars) { From 283485929f7dbc59bd18582a1d22b4586d15be3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 31 Aug 2023 15:31:34 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalaryCustom.properties | 1 + .../salary/formlua/entity/standard/ExcelResult.java | 6 +++--- .../salary/service/impl/FormulaRunServiceImpl.java | 8 +++++--- .../impl/SalaryAcctCalculateServiceImpl.java | 13 +++++++++++-- 4 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 resource/WEB-INF/prop/hrmSalaryCustom.properties diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/WEB-INF/prop/hrmSalaryCustom.properties new file mode 100644 index 000000000..6294cc5c3 --- /dev/null +++ b/resource/WEB-INF/prop/hrmSalaryCustom.properties @@ -0,0 +1 @@ +formulaRunOvertimeThreshold= \ No newline at end of file diff --git a/src/com/engine/salary/formlua/entity/standard/ExcelResult.java b/src/com/engine/salary/formlua/entity/standard/ExcelResult.java index 2a6eb6428..66c5e05a8 100644 --- a/src/com/engine/salary/formlua/entity/standard/ExcelResult.java +++ b/src/com/engine/salary/formlua/entity/standard/ExcelResult.java @@ -41,7 +41,7 @@ public class ExcelResult implements Serializable { /** * 运行时间 */ - private double runTime; + private long runTime; public ExcelResult() { } @@ -137,11 +137,11 @@ public class ExcelResult implements Serializable { this.status = status; } - public double getRunTime() { + public long getRunTime() { return runTime; } - public void setRunTime(double runTime) { + public void setRunTime(long runTime) { this.runTime = runTime; } diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java index e53537e9c..37e8207b4 100644 --- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java +++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java @@ -40,6 +40,8 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService private final BaseBean baseBean = new BaseBean(); private final Boolean isLog = "true".equals(baseBean.getPropValue("hrmSalary", "log")); + //超时提醒 + private final String formulaRunOvertimeThreshold = baseBean.getPropValue("hrmSalaryCustom", "formulaRunOvertimeThreshold"); QlExpress express = new QlExpress(); @@ -47,7 +49,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService @Override public ExcelResult run(ExpressFormula expressFormula, List formulaVars, DataCollectionEmployee simpleEmployee) { ExcelResult result = new ExcelResult(false, "", ""); - if (isLog) { + if (StringUtils.isNotBlank(formulaRunOvertimeThreshold)) { StopWatch stopWatch = new StopWatch(); stopWatch.start("run " + expressFormula.getName()); if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.FORMULA) { @@ -57,8 +59,8 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService result = runSQL(expressFormula, formulaVars); } stopWatch.stop(); - double totalTimeSeconds = stopWatch.getTotalTimeSeconds(); - result.setRunTime(totalTimeSeconds); + long totalTimeMillis = stopWatch.getTotalTimeMillis(); + result.setRunTime(totalTimeMillis); } else { if (ReferenceTypeEnum.parseByValue(expressFormula.getReferenceType()) == ReferenceTypeEnum.FORMULA) { result = runFormula(expressFormula, formulaVars); diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java index 7bfc546fc..018702a7a 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java @@ -34,6 +34,7 @@ import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; +import weaver.general.BaseBean; import weaver.hrm.User; import weaver.wechat.util.Utils; @@ -51,7 +52,9 @@ import java.util.stream.Collectors; **/ @Slf4j public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcctCalculateService { - + BaseBean bb = new BaseBean(); + //公式运行时间超时提醒阈值 + private final String formulaRunOvertimeThreshold = bb.getPropValue("hrmSalaryCustom", "formulaRunOvertimeThreshold"); private SalaryAcctResultService getSalaryAcctResultService(User user) { return ServiceUtil.getService(SalaryAcctResultServiceImpl.class, user); @@ -201,12 +204,18 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc // 运行公式 ExcelResult result = runExpressFormula(expressFormula, formulaVarValueMap, simpleEmployee); resultValue = Utils.null2String(result.getData()); - //公式异常 + //公式异常信息 if (!result.isStatus()) { String username = empInfo.stream().filter(emp -> StringUtils.equals("employeeInfo_username", emp.getFieldId())).findFirst().map(CalculateFormulaVarBO.FormulaVarValue::getFieldValue).orElse(""); String errorMsg = String.format("%s的%s核算异常，原因：%s \r\n", username, salaryItemPO.getName(), result.getErrorMsg()); noticeMsg.append(errorMsg); } + //提醒运行超时 + if (StringUtils.isNotBlank(formulaRunOvertimeThreshold) && result.getRunTime() > Long.parseLong(formulaRunOvertimeThreshold)) { + String username = empInfo.stream().filter(emp -> StringUtils.equals("employeeInfo_username", emp.getFieldId())).findFirst().map(CalculateFormulaVarBO.FormulaVarValue::getFieldValue).orElse(""); + String errorMsg = String.format("%s的%s核算超时，耗时：%s毫秒 \r\n", username, salaryItemPO.getName(), result.getRunTime()); + noticeMsg.append(errorMsg); + } } else { // 处理取值类型为“输入/导入”的薪资项目 String key = SalaryFormulaReferenceEnum.SALARY_ITEM.getValue() + SalaryFormulaFieldConstant.FIELD_ID_SEPARATOR + salaryItemPO.getCode(); From 0ac2fd248e2887e85996e7d2023a8d6edf020d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 31 Aug 2023 16:22:02 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E6=85=A2sql=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/prop/hrmSalaryCustom.properties | 2 +- src/com/engine/salary/service/impl/FormulaRunServiceImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/WEB-INF/prop/hrmSalaryCustom.properties index 6294cc5c3..b873bc15e 100644 --- a/resource/WEB-INF/prop/hrmSalaryCustom.properties +++ b/resource/WEB-INF/prop/hrmSalaryCustom.properties @@ -1 +1 @@ -formulaRunOvertimeThreshold= \ No newline at end of file +formulaRunOvertimeThreshold=10 \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java index 37e8207b4..615c148eb 100644 --- a/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java +++ b/src/com/engine/salary/service/impl/FormulaRunServiceImpl.java @@ -48,7 +48,7 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService @Override public ExcelResult run(ExpressFormula expressFormula, List formulaVars, DataCollectionEmployee simpleEmployee) { - ExcelResult result = new ExcelResult(false, "", ""); + ExcelResult result = new ExcelResult(false, "", "公式类型异常！"); if (StringUtils.isNotBlank(formulaRunOvertimeThreshold)) { StopWatch stopWatch = new StopWatch(); stopWatch.start("run " + expressFormula.getName()); @@ -69,7 +69,6 @@ public class FormulaRunServiceImpl extends Service implements FormulaRunService result = runSQL(expressFormula, formulaVars); } } - log.error("express execute fail, {} not in ReferenceTypeEnum ", expressFormula.getReferenceType()); return result; } From 5ef4c8c909f8653bed4de50818019dd633490f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 1 Sep 2023 11:33:20 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E8=A7=A3=E5=86=B3sql202307100103.sql?= =?UTF-8?q?=E4=B8=8E=E7=BB=84=E7=BB=87=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/DM/sql202307100103.sql | 16 -------- resource/sqlupgrade/DM/sql202307170403.sql | 16 ++++++++ resource/sqlupgrade/GS/sql202307170403.sql | 40 +++++++++++++++++++ resource/sqlupgrade/JC/sql202307100103.sql | 16 -------- resource/sqlupgrade/JC/sql202307170403.sql | 16 ++++++++ resource/sqlupgrade/Mysql/sql202307100103.sql | 5 --- resource/sqlupgrade/Mysql/sql202307170403.sql | 6 +++ .../sqlupgrade/Oracle/sql202307100103.sql | 15 ------- .../sqlupgrade/Oracle/sql202307170403.sql | 16 ++++++++ resource/sqlupgrade/PG/sql202307170403.sql | 6 +++ .../sqlupgrade/SQLServer/sql202307100103.sql | 6 --- .../sqlupgrade/SQLServer/sql202307170403.sql | 7 ++++ resource/sqlupgrade/ST/sql202307100103.sql | 16 -------- resource/sqlupgrade/ST/sql202307170403.sql | 16 ++++++++ 14 files changed, 123 insertions(+), 74 deletions(-) create mode 100644 resource/sqlupgrade/GS/sql202307170403.sql diff --git a/resource/sqlupgrade/DM/sql202307100103.sql b/resource/sqlupgrade/DM/sql202307100103.sql index ffdfcf84f..e69de29bb 100644 --- a/resource/sqlupgrade/DM/sql202307100103.sql +++ b/resource/sqlupgrade/DM/sql202307100103.sql @@ -1,16 +0,0 @@ -alter table hrsa_salary_template - add auto_send_cycle_type NUMBER null; -/ - -alter table hrsa_salary_template - add auto_send_status NUMBER null; -/ - -alter table hrsa_salary_template - add auto_send_day_of_month varchar2(200) NULL; -/ - -alter table hrsa_salary_template - add auto_send_time_of_day varchar2(200) NULL; -/ - diff --git a/resource/sqlupgrade/DM/sql202307170403.sql b/resource/sqlupgrade/DM/sql202307170403.sql index bc59c53ae..97b1c0d48 100644 --- a/resource/sqlupgrade/DM/sql202307170403.sql +++ b/resource/sqlupgrade/DM/sql202307170403.sql @@ -1,3 +1,19 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + alter table hrsa_salary_send_info add bill_read_status NUMBER null; / diff --git a/resource/sqlupgrade/GS/sql202307170403.sql b/resource/sqlupgrade/GS/sql202307170403.sql new file mode 100644 index 000000000..97b1c0d48 --- /dev/null +++ b/resource/sqlupgrade/GS/sql202307170403.sql @@ -0,0 +1,40 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + +alter table hrsa_salary_send_info +add bill_read_status NUMBER null; +/ + +alter table hrsa_salary_send_info +add bill_confirm_status NUMBER null; +/ + +alter table hrsa_salary_send_info +add send_employee_id NUMBER(38,0) NULL; +/ + +alter table hrsa_salary_template +add ack_feedback_status NUMBER NULL; +/ + +alter table hrsa_salary_template +add auto_ack_days NUMBER NULL; +/ + +alter table hrsa_salary_template +add feedback_url VARCHAR2(500) NULL; +/ + diff --git a/resource/sqlupgrade/JC/sql202307100103.sql b/resource/sqlupgrade/JC/sql202307100103.sql index ffdfcf84f..e69de29bb 100644 --- a/resource/sqlupgrade/JC/sql202307100103.sql +++ b/resource/sqlupgrade/JC/sql202307100103.sql @@ -1,16 +0,0 @@ -alter table hrsa_salary_template - add auto_send_cycle_type NUMBER null; -/ - -alter table hrsa_salary_template - add auto_send_status NUMBER null; -/ - -alter table hrsa_salary_template - add auto_send_day_of_month varchar2(200) NULL; -/ - -alter table hrsa_salary_template - add auto_send_time_of_day varchar2(200) NULL; -/ - diff --git a/resource/sqlupgrade/JC/sql202307170403.sql b/resource/sqlupgrade/JC/sql202307170403.sql index bc59c53ae..97b1c0d48 100644 --- a/resource/sqlupgrade/JC/sql202307170403.sql +++ b/resource/sqlupgrade/JC/sql202307170403.sql @@ -1,3 +1,19 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + alter table hrsa_salary_send_info add bill_read_status NUMBER null; / diff --git a/resource/sqlupgrade/Mysql/sql202307100103.sql b/resource/sqlupgrade/Mysql/sql202307100103.sql index d283335e1..e69de29bb 100644 --- a/resource/sqlupgrade/Mysql/sql202307100103.sql +++ b/resource/sqlupgrade/Mysql/sql202307100103.sql @@ -1,5 +0,0 @@ -ALTER TABLE hrsa_salary_template -ADD COLUMN auto_send_status int NULL, -ADD COLUMN auto_send_cycle_type int NULL, -ADD COLUMN auto_send_day_of_month varchar(200) NULL, -ADD COLUMN auto_send_time_of_day varchar(50) NULL; \ No newline at end of file diff --git a/resource/sqlupgrade/Mysql/sql202307170403.sql b/resource/sqlupgrade/Mysql/sql202307170403.sql index a01647d03..92f01e92a 100644 --- a/resource/sqlupgrade/Mysql/sql202307170403.sql +++ b/resource/sqlupgrade/Mysql/sql202307170403.sql @@ -1,3 +1,9 @@ +ALTER TABLE hrsa_salary_template +ADD COLUMN auto_send_status int NULL, +ADD COLUMN auto_send_cycle_type int NULL, +ADD COLUMN auto_send_day_of_month varchar(200) NULL, +ADD COLUMN auto_send_time_of_day varchar(50) NULL; + ALTER TABLE hrsa_salary_send_info ADD COLUMN bill_read_status int NULL, ADD COLUMN bill_confirm_status int NULL, diff --git a/resource/sqlupgrade/Oracle/sql202307100103.sql b/resource/sqlupgrade/Oracle/sql202307100103.sql index 73836e82e..e69de29bb 100644 --- a/resource/sqlupgrade/Oracle/sql202307100103.sql +++ b/resource/sqlupgrade/Oracle/sql202307100103.sql @@ -1,15 +0,0 @@ -alter table hrsa_salary_template - add auto_send_cycle_type NUMBER null -/ - -alter table hrsa_salary_template - add auto_send_status NUMBER null -/ - -alter table hrsa_salary_template - add auto_send_day_of_month varchar2(200) NULL -/ - -alter table hrsa_salary_template - add auto_send_time_of_day varchar2(200) NULL -/ \ No newline at end of file diff --git a/resource/sqlupgrade/Oracle/sql202307170403.sql b/resource/sqlupgrade/Oracle/sql202307170403.sql index 8765e111d..7f7ef85af 100644 --- a/resource/sqlupgrade/Oracle/sql202307170403.sql +++ b/resource/sqlupgrade/Oracle/sql202307170403.sql @@ -1,3 +1,19 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL +/ + alter table hrsa_salary_send_info add bill_read_status NUMBER null / diff --git a/resource/sqlupgrade/PG/sql202307170403.sql b/resource/sqlupgrade/PG/sql202307170403.sql index a01647d03..92f01e92a 100644 --- a/resource/sqlupgrade/PG/sql202307170403.sql +++ b/resource/sqlupgrade/PG/sql202307170403.sql @@ -1,3 +1,9 @@ +ALTER TABLE hrsa_salary_template +ADD COLUMN auto_send_status int NULL, +ADD COLUMN auto_send_cycle_type int NULL, +ADD COLUMN auto_send_day_of_month varchar(200) NULL, +ADD COLUMN auto_send_time_of_day varchar(50) NULL; + ALTER TABLE hrsa_salary_send_info ADD COLUMN bill_read_status int NULL, ADD COLUMN bill_confirm_status int NULL, diff --git a/resource/sqlupgrade/SQLServer/sql202307100103.sql b/resource/sqlupgrade/SQLServer/sql202307100103.sql index bd867842c..e69de29bb 100644 --- a/resource/sqlupgrade/SQLServer/sql202307100103.sql +++ b/resource/sqlupgrade/SQLServer/sql202307100103.sql @@ -1,6 +0,0 @@ -ALTER TABLE hrsa_salary_template -ADD auto_send_status int NULL, -auto_send_cycle_type int NULL, -auto_send_day_of_month varchar(200) NULL, -auto_send_time_of_day varchar(50) NULL -GO \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202307170403.sql b/resource/sqlupgrade/SQLServer/sql202307170403.sql index de0724f06..e93c78b4e 100644 --- a/resource/sqlupgrade/SQLServer/sql202307170403.sql +++ b/resource/sqlupgrade/SQLServer/sql202307170403.sql @@ -1,3 +1,10 @@ +ALTER TABLE hrsa_salary_template +ADD auto_send_status int NULL, +auto_send_cycle_type int NULL, +auto_send_day_of_month varchar(200) NULL, +auto_send_time_of_day varchar(50) NULL +GO + ALTER TABLE hrsa_salary_send_info ADD bill_read_status int NULL, bill_confirm_status int NULL, diff --git a/resource/sqlupgrade/ST/sql202307100103.sql b/resource/sqlupgrade/ST/sql202307100103.sql index ffdfcf84f..e69de29bb 100644 --- a/resource/sqlupgrade/ST/sql202307100103.sql +++ b/resource/sqlupgrade/ST/sql202307100103.sql @@ -1,16 +0,0 @@ -alter table hrsa_salary_template - add auto_send_cycle_type NUMBER null; -/ - -alter table hrsa_salary_template - add auto_send_status NUMBER null; -/ - -alter table hrsa_salary_template - add auto_send_day_of_month varchar2(200) NULL; -/ - -alter table hrsa_salary_template - add auto_send_time_of_day varchar2(200) NULL; -/ - diff --git a/resource/sqlupgrade/ST/sql202307170403.sql b/resource/sqlupgrade/ST/sql202307170403.sql index bc59c53ae..97b1c0d48 100644 --- a/resource/sqlupgrade/ST/sql202307170403.sql +++ b/resource/sqlupgrade/ST/sql202307170403.sql @@ -1,3 +1,19 @@ +alter table hrsa_salary_template + add auto_send_cycle_type NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_status NUMBER null; +/ + +alter table hrsa_salary_template + add auto_send_day_of_month varchar2(200) NULL; +/ + +alter table hrsa_salary_template + add auto_send_time_of_day varchar2(200) NULL; +/ + alter table hrsa_salary_send_info add bill_read_status NUMBER null; /