From 8ff4e9e23178e55dfd07829982e977d8dd72f787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 7 Sep 2022 09:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=96=AA=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../param/SalaryArchiveStopParam.java | 39 ++++++++++++++++
.../salary/service/SalaryArchiveService.java | 11 +++--
.../impl/SalaryArchiveServiceImpl.java | 23 ++++++++++
.../salary/web/SalaryArchiveController.java | 9 ++++
.../salary/wrapper/SalaryArchiveWrapper.java | 44 ++++++++++++-------
5 files changed, 105 insertions(+), 21 deletions(-)
create mode 100644 src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveStopParam.java
diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveStopParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveStopParam.java
new file mode 100644
index 000000000..14dc448da
--- /dev/null
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveStopParam.java
@@ -0,0 +1,39 @@
+package com.engine.salary.entity.salaryarchive.param;
+
+import com.engine.salary.util.valid.DataCheck;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * 停薪
+ * Copyright: Copyright (c) 2022
+ * Company: 泛微软件
+ *
+ * @author qiantao
+ * @version 1.0
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SalaryArchiveStopParam {
+
+ /**
+ * 档案id
+ */
+ @DataCheck(require = true, message = "薪资档案id为空")
+ private Long salaryArchiveId;
+
+ /**
+ * 最后发薪日期
+ */
+ private Date payEndDate;
+ @DataCheck(require = true, message = "最后发薪日期为空")
+ private String payEndDateStr;
+
+
+}
diff --git a/src/com/engine/salary/service/SalaryArchiveService.java b/src/com/engine/salary/service/SalaryArchiveService.java
index 3f04455c6..7cbade316 100644
--- a/src/com/engine/salary/service/SalaryArchiveService.java
+++ b/src/com/engine/salary/service/SalaryArchiveService.java
@@ -3,10 +3,7 @@ package com.engine.salary.service;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveDimissionSaveParam;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportHandleParam;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam;
+import com.engine.salary.entity.salaryarchive.param.*;
import com.engine.salary.entity.salaryarchive.po.SalaryArchiveDimissionPO;
import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO;
import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
@@ -161,4 +158,10 @@ public interface SalaryArchiveService {
* @return
*/
Map importSalaryArchiveAction(SalaryArchiveImportActionParam importData, boolean ifImportData);
+
+ /**
+ * 停薪
+ * @param stopSalaryParam
+ */
+ void stopSalary(SalaryArchiveStopParam stopSalaryParam);
}
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 189ac5f3c..cae360670 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -41,6 +41,7 @@ import com.engine.salary.util.excel.ExcelSupport;
import com.engine.salary.util.excel.ExcelUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
+import com.engine.salary.util.valid.ValidUtil;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -702,6 +703,28 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
}
+ @Override
+ public void stopSalary(SalaryArchiveStopParam stopSalaryParam) {
+ ValidUtil.doValidator(stopSalaryParam);
+ stopSalaryParam.setPayEndDate(SalaryDateUtil.stringToDate(stopSalaryParam.getPayEndDateStr()));
+
+ SalaryArchivePO po = getSalaryArchiveMapper().getById(stopSalaryParam.getSalaryArchiveId());
+
+ if (po == null) {
+ throw new SalaryRunTimeException("未找到薪资档案");
+ }
+ Date payStartDate = po.getPayStartDate();
+ Date payEndDate = stopSalaryParam.getPayEndDate();
+ if(payEndDate.before(payStartDate)){
+ throw new SalaryRunTimeException("最后缴纳日期应大于起始缴纳日期");
+ }
+
+ po.setPayEndDate(payEndDate);
+ po.setUpdateTime(new Date());
+ getSalaryArchiveMapper().update(po);
+
+ }
+
@Override
public Map preview(SalaryArchiveImportHandleParam param) {
diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java
index 2ad62d3f5..7a84f7564 100644
--- a/src/com/engine/salary/web/SalaryArchiveController.java
+++ b/src/com/engine/salary/web/SalaryArchiveController.java
@@ -275,6 +275,15 @@ public class SalaryArchiveController {
return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::searchCondition);
}
+ //停薪
+ @POST
+ @Path("/stopSalary")
+ @Produces(MediaType.APPLICATION_JSON)
+ public String stopSalary(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveStopParam stopSalaryParam) {
+ User user = HrmUserVarify.getUser(request, response);
+ return new ResponseResult(user).run(getSalaryArchiveWrapper(user)::stopSalary,stopSalaryParam);
+ }
+
// ******** 薪资档案主表 end ***********************************************************************************************/
// ******** 薪资项目调整 start ***********************************************************************************************/
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
index 4d3eab9a7..e3c6beaf6 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
@@ -11,10 +11,7 @@ import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveBaseInfoFormDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveFormDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveDimissionSaveParam;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportHandleParam;
-import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam;
+import com.engine.salary.entity.salaryarchive.param.*;
import com.engine.salary.entity.salaryarchive.po.SalaryArchiveDimissionPO;
import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO;
import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO;
@@ -260,6 +257,7 @@ public class SalaryArchiveWrapper extends Service {
/**
* 预览
+ *
* @param param
* @return
*/
@@ -269,6 +267,7 @@ public class SalaryArchiveWrapper extends Service {
/**
* 导入档案
+ *
* @param param
* @return
*/
@@ -278,6 +277,7 @@ public class SalaryArchiveWrapper extends Service {
/**
* 导出列表
+ *
* @param queryParam
* @return
*/
@@ -285,20 +285,21 @@ public class SalaryArchiveWrapper extends Service {
return getSalaryArchiveService(user).exportList(queryParam);
}
- public Map checkImportSalaryArchive(SalaryArchiveImportHandleParam param) {
+ public Map checkImportSalaryArchive(SalaryArchiveImportHandleParam param) {
String queryImageId = "select imagefileid from docimagefile where docid = ?";
- if (param.getImageId() != null && !"".equals(param.getImageId())){
+ if (param.getImageId() != null && !"".equals(param.getImageId())) {
RecordSet rs = new RecordSet();
- rs.executeQuery(queryImageId,param.getImageId());
- if (rs.next()){
+ rs.executeQuery(queryImageId, param.getImageId());
+ if (rs.next()) {
param.setImageId(rs.getString("imagefileid"));
}
}
- return getSalaryArchiveService(user).importSalaryArchive(param,false);
+ return getSalaryArchiveService(user).importSalaryArchive(param, false);
}
/**
* 人员状态列表
+ *
* @return
*/
public Map searchCondition() {
@@ -314,23 +315,32 @@ public class SalaryArchiveWrapper extends Service {
return map;
}
- public Map selectSalaryArchiveColumns(String importType){
+ public Map selectSalaryArchiveColumns(String importType) {
return getSalaryArchiveService(user).selectSalaryArchiveColumns(SalaryArchiveImportTypeEnum.parseByValue(importType));
}
- public Map importSalaryArchiveInit(SalaryArchiveImportActionParam importData){
+ public Map importSalaryArchiveInit(SalaryArchiveImportActionParam importData) {
importData.setImportType("init");
- return getSalaryArchiveService(user).importSalaryArchiveAction(importData,false);
+ return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);
}
- public Map importSalaryArchiveSalaryItemAdjust(SalaryArchiveImportActionParam importData){
+
+ public Map importSalaryArchiveSalaryItemAdjust(SalaryArchiveImportActionParam importData) {
importData.setImportType("salaryItemAdjust");
- return getSalaryArchiveService(user).importSalaryArchiveAction(importData,false);
+ return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);
}
- public Map importSalaryArchiveTaxAgentAdjust(SalaryArchiveImportActionParam importData){
+
+ public Map importSalaryArchiveTaxAgentAdjust(SalaryArchiveImportActionParam importData) {
importData.setImportType("taxAgentAdjust");
- return getSalaryArchiveService(user).importSalaryArchiveAction(importData,false);
+ return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);
}
-
+ /**
+ * 停薪
+ * @param stopSalaryParam
+ * @return
+ */
+ public void stopSalary(SalaryArchiveStopParam stopSalaryParam) {
+ getSalaryArchiveService(user).stopSalary(stopSalaryParam);
+ }
}