qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

停薪操作

This commit is contained in:
钱涛 2022-09-07 09:45:37 +08:00
parent c84836d490
commit 8ff4e9e231
5 changed files with 105 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveStopParam.java Normal file
View File

@ -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;
/**
* 停薪
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @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;
}

11
src/com/engine/salary/service/SalaryArchiveService.java
View File

@ -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<String, Object> importSalaryArchiveAction(SalaryArchiveImportActionParam importData, boolean ifImportData);
/**
* 停薪
* @param stopSalaryParam
*/
void stopSalary(SalaryArchiveStopParam stopSalaryParam);
}

23
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -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<String, Object> preview(SalaryArchiveImportHandleParam param) {

9
src/com/engine/salary/web/SalaryArchiveController.java
View File

@ -275,6 +275,15 @@ public class SalaryArchiveController {
return new ResponseResult<SingleTaxAgentAdjustRecordQueryParam, Map<String, Object>>(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<SalaryArchiveStopParam, String>(user).run(getSalaryArchiveWrapper(user)::stopSalary,stopSalaryParam);
}
// ******** 薪资档案主表 end ***********************************************************************************************/
// ******** 薪资项目调整 start ***********************************************************************************************/

44
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -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<String,Object> checkImportSalaryArchive(SalaryArchiveImportHandleParam param) {
public Map<String, Object> 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<String, Object> searchCondition() {
@ -314,23 +315,32 @@ public class SalaryArchiveWrapper extends Service {
return map;
}
public Map<String,Object> selectSalaryArchiveColumns(String importType){
public Map<String, Object> selectSalaryArchiveColumns(String importType) {
return getSalaryArchiveService(user).selectSalaryArchiveColumns(SalaryArchiveImportTypeEnum.parseByValue(importType));
}
public Map<String, Object> importSalaryArchiveInit(SalaryArchiveImportActionParam importData){
public Map<String, Object> importSalaryArchiveInit(SalaryArchiveImportActionParam importData) {
importData.setImportType("init");
return getSalaryArchiveService(user).importSalaryArchiveAction(importData,false);
return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);
}
public Map<String, Object> importSalaryArchiveSalaryItemAdjust(SalaryArchiveImportActionParam importData){
public Map<String, Object> importSalaryArchiveSalaryItemAdjust(SalaryArchiveImportActionParam importData) {
importData.setImportType("salaryItemAdjust");
return getSalaryArchiveService(user).importSalaryArchiveAction(importData,false);
return getSalaryArchiveService(user).importSalaryArchiveAction(importData, false);
}
public Map<String, Object> importSalaryArchiveTaxAgentAdjust(SalaryArchiveImportActionParam importData){
public Map<String, Object> 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);
}
}