From 78cb59f07f399c5b55b83df167208094b2dfe517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 13 Feb 2023 13:27:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryArchiveQueryParam.java | 1 + .../salaryArchive/SalaryArchiveCommon.java | 45 --------------- .../SalaryArchiveInitAction.java | 56 ------------------- .../SalaryArchiveSalaryItemAdjustAction.java | 54 ------------------ 4 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java delete mode 100644 src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java delete mode 100644 src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index 251e197e1..41682ab45 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -30,6 +30,7 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { //姓名 private String username; + private Long userId; //个税扣缴义务人id private Long taxAgentId; diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java deleted file mode 100644 index c11ea85d6..000000000 --- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveCommon.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.engine.salary.process.salaryArchive; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import weaver.conn.RecordSet; - -import java.util.List; -import java.util.Map; - -public class SalaryArchiveCommon { - - public static Map getImportDatas(String requestId,String tableName){ - RecordSet rs = new RecordSet(); - String sql = "select xzxmdr,xzxmpldr from "+tableName+" where requestid="+requestId; - rs.executeQuery(sql); - Map dataMap = Maps.newHashMap(); - List> importDatas = Lists.newArrayList(); - dataMap.put("importDatas",importDatas); - if (rs.next()){ - String data = rs.getString("xzxmdr"); - dataMap.put("imageId",rs.getString("xzxmpldr")); - if (data != null && !"".equals(data)){ - if (data.contains(""")){ - data = data.replaceAll(""","\""); - } - JSONArray jsonObject = JSONObject.parseArray(data); - jsonObject.forEach(e -> { - Map map = (Map)e; - importDatas.add(map); - }); - } - } - String queryImageId = "select imagefileid from docimagefile where docid = ?"; - if (dataMap.get("imageId") != null && !"".equals(dataMap.get("imageId"))){ - rs.executeQuery(queryImageId,dataMap.get("imageId")); - if (rs.next()){ - dataMap.put("imageId",rs.getString("imagefileid")); - } - } - - return dataMap; - } -} diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java deleted file mode 100644 index 718a20bd2..000000000 --- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveInitAction.java +++ /dev/null @@ -1,56 +0,0 @@ -//package com.engine.salary.process.salaryArchive; -// -//import com.engine.common.util.ServiceUtil; -//import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; -//import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportHandleParam; -//import com.engine.salary.service.SalaryArchiveService; -//import com.engine.salary.service.impl.SalaryArchiveServiceImpl; -//import weaver.general.BaseBean; -//import weaver.hrm.User; -//import weaver.interfaces.workflow.action.Action; -//import weaver.soa.workflow.request.RequestInfo; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * 薪资档案流程使用,导入薪资档案（初始化) -// *

Copyright: Copyright (c) 2022

-// *

Company: 泛微软件

-// * -// * @author liuliang -// * @version 1.0 -// **/ -//public class SalaryArchiveInitAction extends BaseBean implements Action { -// private SalaryArchiveService getSalaryArchiveService(User user) { -// return (SalaryArchiveService) ServiceUtil.getService(SalaryArchiveServiceImpl.class, user); -// } -// @Override -// public String execute(RequestInfo requestInfo) { -// String requestId = requestInfo.getRequestid(); -// String tableName = requestInfo.getRequestManager().getBillTableName(); -// writeLog("requestId:"+requestId); -// writeLog("tableName:"+tableName); -// Map dataMap = SalaryArchiveCommon.getImportDatas(requestId,tableName); -// List> importDatas = (List>)dataMap.get("importDatas"); -// String imageId = dataMap.get("imageId") == null?"":dataMap.get("imageId").toString(); -// User user = new User(Integer.valueOf(importDatas.get(0).get("userId").toString())); -// //手动列表添加导入 -// if (importDatas.size() > 0){ -// -// SalaryArchiveImportActionParam importData = SalaryArchiveImportActionParam.builder().importDatas(importDatas) -// .importType("init").build(); -// -// Map resultMap = getSalaryArchiveService(user).importSalaryArchiveAction(importData,true); -// writeLog("result :"+resultMap.toString()); -// } -// //附件上传导入 -// if (!"".equals(imageId)){ -// SalaryArchiveImportHandleParam param = SalaryArchiveImportHandleParam.builder().imageId(imageId).importType("init").build(); -// Map responseMap = getSalaryArchiveService(user).importSalaryArchive(param); -// writeLog("result :"+responseMap.toString()); -// } -// -// return SUCCESS; -// } -//} diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java deleted file mode 100644 index a4930f3f8..000000000 --- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveSalaryItemAdjustAction.java +++ /dev/null @@ -1,54 +0,0 @@ -//package com.engine.salary.process.salaryArchive; -// -//import com.engine.common.util.ServiceUtil; -//import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; -//import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportHandleParam; -//import com.engine.salary.service.SalaryArchiveService; -//import com.engine.salary.service.impl.SalaryArchiveServiceImpl; -//import weaver.general.BaseBean; -//import weaver.hrm.User; -//import weaver.interfaces.workflow.action.Action; -//import weaver.soa.workflow.request.RequestInfo; -// -//import java.util.List; -//import java.util.Map; -// -///** -// * 薪资档案流程使用,导入薪资档案（调薪） -// *

Copyright: Copyright (c) 2022

-// *

Company: 泛微软件

-// * -// * @author liuliang -// * @version 1.0 -// **/ -//public class SalaryArchiveSalaryItemAdjustAction extends BaseBean implements Action { -// private SalaryArchiveService getSalaryArchiveService(User user) { -// return (SalaryArchiveService) ServiceUtil.getService(SalaryArchiveServiceImpl.class, user); -// } -// @Override -// public String execute(RequestInfo requestInfo) { -// String requestId = requestInfo.getRequestid(); -// String tableName = requestInfo.getRequestManager().getBillTableName(); -// writeLog("requestId:"+requestId); -// writeLog("tableName:"+tableName); -// Map dataMap = SalaryArchiveCommon.getImportDatas(requestId,tableName); -// List> importDatas = (List>)dataMap.get("importDatas"); -// String imageId = dataMap.get("imageId").toString(); -// User user = new User(Integer.valueOf(importDatas.get(0).get("userId").toString())); -// if (importDatas.size() > 0){ -// -// SalaryArchiveImportActionParam importData = SalaryArchiveImportActionParam.builder().importDatas(importDatas) -// .importType("salaryItemAdjust").build(); -// -// Map resultMap = getSalaryArchiveService(user).importSalaryArchiveAction(importData,true); -// writeLog("result :"+resultMap.toString()); -// } -// //附件上传导入 -// if (!"".equals(imageId)){ -// SalaryArchiveImportHandleParam param = SalaryArchiveImportHandleParam.builder().imageId(imageId).importType("salaryItemAdjust").build(); -// Map responseMap = getSalaryArchiveService(user).importSalaryArchive(param); -// writeLog("result :"+responseMap.toString()); -// } -// return SUCCESS; -// } -//} From 8b594c188257c1e0a4ddaa4ecb49d2f264e907b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 13 Feb 2023 14:53:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=8F=91=E8=B5=B7=E8=B0=83?= =?UTF-8?q?=E8=96=AA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SalaryArchiveQueryParam.java | 3 ++- .../mapper/archive/SalaryArchiveMapper.xml | 3 +++ .../salaryArchive/SalaryArchiveActionAPI.java | 22 +++++++++---------- .../service/impl/TaxAgentServiceImpl.java | 2 -- .../salary/wrapper/SalaryArchiveWrapper.java | 13 ++++++++++- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index 41682ab45..e3f66c1d4 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -30,10 +30,11 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { //姓名 private String username; - private Long userId; + private Long employeeId; //个税扣缴义务人id private Long taxAgentId; + private String taxAgentName; //分部id private List subcompanyIds; diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 309b3a926..7382ac4b6 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -464,6 +464,9 @@ FROM hrsa_salary_archive t WHERE t.delete_type = 0 + + AND t.employee_id = #{param.employeeId} + AND t.employee_id IN diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java index 51364ff38..cc10edaa7 100644 --- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java @@ -2,6 +2,8 @@ package com.engine.salary.process.salaryArchive; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; +import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam; +import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.util.ResponseResult; import com.engine.salary.wrapper.SalaryArchiveWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -84,17 +86,13 @@ public class SalaryArchiveActionAPI { return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::adjustmentSalaryArchive, importData); } -// /** -// * 导入薪资档案附件上传前置校验 -// * @param importParam -// * @return -// */ -// @POST -// @Path("/checkImportSalaryArchiveUpload") -// @Produces(MediaType.APPLICATION_JSON) -// public String checkParam(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveImportHandleParam importParam) { -// User user = HrmUserVarify.getUser(request, response); -// return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::checkImportSalaryArchive, importParam); -// } + @POST + @Path("/salaryArchiveId") + @Produces(MediaType.APPLICATION_JSON) + public String adjustmentSalaryArchive(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalaryArchiveWrapper(user)::getSalaryArchiveInfo, param); + } + } diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index d5c5799ed..7addd6ac8 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -626,8 +626,6 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { } - - @Override public List listTaxAgentAndEmployeeTree() { List taxAgentManageRangeEmployeeList = Lists.newArrayList(); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index fa7ad2873..4be7ef8a7 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -350,7 +350,7 @@ public class SalaryArchiveWrapper extends Service { // 获取所有可被引用的薪资项目 List salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems() - .stream().filter(item->getSalaryItemService(user).filterInRange(Collections.singleton(taxAgentId), item)) + .stream().filter(item -> getSalaryItemService(user).filterInRange(Collections.singleton(taxAgentId), item)) .collect(Collectors.toList()); Collection salaryItemIds = salaryItemList.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); List salaryArchiveItemList = getSalaryArchiveService(user).getCurrentEffectiveItemList(Collections.singletonList(salaryArchiveId), salaryItemIds); @@ -548,4 +548,15 @@ public class SalaryArchiveWrapper extends Service { public Map handleRepeatData() { return getSalaryArchiveService(user).handleRepeatData(); } + + public SalaryArchivePO getSalaryArchiveInfo(SalaryArchiveQueryParam param) { + List list = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().employeeId(param.getEmployeeId()).taxAgentId(param.getTaxAgentId()).build()); + if (CollectionUtils.isEmpty(list)) { + throw new SalaryRunTimeException("薪资档案不存在!"); + } + if (list.size() > 1) { + throw new SalaryRunTimeException("存在多个薪资档案!"); + } + return list.get(0); + } }