From fb42a5f0419d0d17fd0fb6d4cf1d2a19954d61df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 1 Mar 2022 18:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3ids?= =?UTF-8?q?=E6=94=B9=E4=B8=BAjson=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/web/TaxDeclarationController.java | 7 + .../cmd/TaxAgent/TaxAgentDeleteCmd.java | 10 +- .../salary/service/TaxDeclarationService.java | 18 +++ .../salary/service/TaxRateBaseService.java | 2 - .../impl/TaxDeclarationServiceImpl.java | 30 ++++ .../engine/salary/web/TaxAgentController.java | 18 +-- .../salary/web/TaxDeclarationController.java | 131 ++++++++++++++++++ .../engine/salary/wrapper/TaxRateWrapper.java | 21 --- 8 files changed, 198 insertions(+), 39 deletions(-) create mode 100644 src/com/api/salary/web/TaxDeclarationController.java create mode 100644 src/com/engine/salary/service/TaxDeclarationService.java create mode 100644 src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java create mode 100644 src/com/engine/salary/web/TaxDeclarationController.java delete mode 100644 src/com/engine/salary/wrapper/TaxRateWrapper.java diff --git a/src/com/api/salary/web/TaxDeclarationController.java b/src/com/api/salary/web/TaxDeclarationController.java new file mode 100644 index 000000000..352bc706f --- /dev/null +++ b/src/com/api/salary/web/TaxDeclarationController.java @@ -0,0 +1,7 @@ +package com.api.salary.web; + +import javax.ws.rs.Path; + +@Path("/bs/hrmsalary/taxdeclaration") +public class TaxDeclarationController extends com.engine.salary.web.TaxDeclarationController{ +} diff --git a/src/com/engine/salary/cmd/TaxAgent/TaxAgentDeleteCmd.java b/src/com/engine/salary/cmd/TaxAgent/TaxAgentDeleteCmd.java index 6a85fc8fb..09d5e8a3d 100644 --- a/src/com/engine/salary/cmd/TaxAgent/TaxAgentDeleteCmd.java +++ b/src/com/engine/salary/cmd/TaxAgent/TaxAgentDeleteCmd.java @@ -7,18 +7,13 @@ import com.engine.salary.entity.taxrate.TaxAgent; import com.engine.salary.entity.taxrate.param.TaxAgentQueryParam; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.TaxAgentMapper; -import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.session.SqlSession; -import org.springframework.beans.BeanUtils; import weaver.conn.mybatis.MyBatisFactory; -import weaver.general.Util; import weaver.hrm.User; import java.lang.reflect.Array; import java.util.*; -import java.util.stream.Collectors; public class TaxAgentDeleteCmd extends AbstractCommonCommand> { @@ -36,11 +31,10 @@ public class TaxAgentDeleteCmd extends AbstractCommonCommand public Map execute(CommandContext commandContext) { Map apidatas = new HashMap(16); - List ids = castList(params.get("ids"), String.class); - if (CollectionUtils.isEmpty(ids)) { + Collection idList = (Collection)params.get("ids"); + if (CollectionUtils.isEmpty(idList)) { throw new SalaryRunTimeException("参数错误"); } - List idList = ids.stream().map(Long::valueOf).collect(Collectors.toList()); SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); diff --git a/src/com/engine/salary/service/TaxDeclarationService.java b/src/com/engine/salary/service/TaxDeclarationService.java new file mode 100644 index 000000000..c3951ffde --- /dev/null +++ b/src/com/engine/salary/service/TaxDeclarationService.java @@ -0,0 +1,18 @@ +package com.engine.salary.service; + +import java.util.Map; + +public interface TaxDeclarationService { + + /** + * 分页列表 + */ + Map listPage(Map params); + + Map delete(Map params); + + Map save(Map params); + + Map update(Map params); + +} diff --git a/src/com/engine/salary/service/TaxRateBaseService.java b/src/com/engine/salary/service/TaxRateBaseService.java index b4fe1c91e..4a2df459a 100644 --- a/src/com/engine/salary/service/TaxRateBaseService.java +++ b/src/com/engine/salary/service/TaxRateBaseService.java @@ -3,8 +3,6 @@ package com.engine.salary.service; import java.util.Map; public interface TaxRateBaseService { - - /** * 分页列表 */ diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java new file mode 100644 index 000000000..13a4d24a2 --- /dev/null +++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java @@ -0,0 +1,30 @@ +package com.engine.salary.service.impl; + +import com.engine.core.impl.Service; +import com.engine.salary.service.TaxDeclarationService; + +import java.util.Map; + +public class TaxDeclarationServiceImpl extends Service implements TaxDeclarationService { + + @Override + public Map listPage(Map params) { + + return null; + } + + @Override + public Map delete(Map params) { + return null; + } + + @Override + public Map save(Map params) { + return null; + } + + @Override + public Map update(Map params) { + return null; + } +} diff --git a/src/com/engine/salary/web/TaxAgentController.java b/src/com/engine/salary/web/TaxAgentController.java index 029538ee4..97c639ea8 100644 --- a/src/com/engine/salary/web/TaxAgentController.java +++ b/src/com/engine/salary/web/TaxAgentController.java @@ -5,20 +5,20 @@ import com.engine.common.util.ServiceUtil; import com.engine.salary.service.TaxAgentService; import com.engine.salary.service.impl.TaxAgentServiceImpl; import com.engine.salary.util.ResponseResult; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.beanutils.BeanUtils; +import io.swagger.v3.oas.annotations.parameters.RequestBody; import weaver.general.BaseBean; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.*; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; +import java.util.Collection; import java.util.Map; public class TaxAgentController { @@ -73,9 +73,11 @@ public class TaxAgentController { @POST @Path("/delete") @Produces(MediaType.APPLICATION_JSON) - public String delete(@Context HttpServletRequest request, @Context HttpServletResponse response) { + public String delete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Collection ids) { User user = HrmUserVarify.getUser(request, response); - return ResponseResult.run(getService(user)::delete, ParamUtil.request2Map(request)); + Map map = ParamUtil.request2Map(request); + map.put("ids",ids); + return ResponseResult.run(getService(user)::delete, map); } /** diff --git a/src/com/engine/salary/web/TaxDeclarationController.java b/src/com/engine/salary/web/TaxDeclarationController.java new file mode 100644 index 000000000..f90380c09 --- /dev/null +++ b/src/com/engine/salary/web/TaxDeclarationController.java @@ -0,0 +1,131 @@ +package com.engine.salary.web; + +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; +import com.engine.salary.entity.taxrate.param.TaxRateSaveParam; +import com.engine.salary.service.TaxRateBaseService; +import com.engine.salary.service.impl.TaxRateBaseServiceImpl; +import com.engine.salary.util.ResponseResult; +import io.swagger.v3.oas.annotations.parameters.RequestBody; +import weaver.general.BaseBean; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.Map; + +public class TaxDeclarationController { + + private BaseBean logger = new BaseBean(); + + private TaxRateBaseService getService(User user) { + return (TaxRateBaseService) ServiceUtil.getService(TaxRateBaseServiceImpl.class, user); + } + + + //税率表列表 + @GET + @Path("/list") + @Produces(MediaType.APPLICATION_JSON) + public String list(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return ResponseResult.run(getService(user)::listPage, ParamUtil.request2Map(request)); + } + + + /** + * 新建税率表 + */ + @POST + @Path("/save") + @Produces(MediaType.APPLICATION_JSON) + public String save(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody TaxRateSaveParam taxRateSaveParam) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + map.put("taxRateSaveParam",taxRateSaveParam); + return ResponseResult.run(getService(user)::save, map); + } + + /** + * 新建税率表 + */ + @POST + @Path("/update") + @Produces(MediaType.APPLICATION_JSON) + public String update(@Context HttpServletRequest request, @Context HttpServletResponse response,@RequestBody TaxRateSaveParam taxRateSaveParam) { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + map.put("taxRateSaveParam",taxRateSaveParam); + return ResponseResult.run(getService(user)::update, map); + } + + /** + * 删除税率表 + */ + @POST + @Path("/delete") + @Produces(MediaType.APPLICATION_JSON) + public String deleteTaxRate(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return ResponseResult.run(getService(user)::delete, ParamUtil.request2Map(request)); + } + + + + // @PostMapping("/list") + // @ApiOperation("个税申报表列表") + // @WeaPermission + // public WeaResult> listTaxDeclaration(@RequestBody TaxDeclarationListQueryParam queryParam) { + // WeaTable weaTable = taxDeclarationWrapper.listPage(queryParam, TenantContext.getCurrentTenantKey()); + // return WeaResult.success(weaTable); + // } + // + // @GetMapping("/getForm") + // @ApiOperation("个税申报表表单") + // @WeaPermission + // public WeaResult getForm(@RequestParam(value = "id", required = false) Long id) { + // WeaForm weaForm = taxDeclarationWrapper.getForm(id, TenantContext.getCurrentTenantKey()); + // return WeaResult.success(weaForm); + // } + // + // @GetMapping("/getTaxDeclarationInfo") + // @ApiOperation("个税申报表相关信息") + // @WeaPermission + // public WeaResult getTaxDeclarationInfo(@RequestParam(value = "taxDeclarationId") Long taxDeclarationId) { + // TaxDeclarationInfoDTO taxDeclarationInfo = taxDeclarationWrapper.getTaxDeclarationInfoById(taxDeclarationId, TenantContext.getCurrentTenantKey()); + // return WeaResult.success(taxDeclarationInfo); + // } + // + // @PostMapping("/save") + // @ApiOperation("个税申报表生成") + // @WeaPermission + // public WeaResult saveTaxDeclaration(@RequestBody TaxDeclarationSaveParam saveParam) { + // taxDeclarationWrapper.save(saveParam, UserContext.getCurrentEmployeeId(), TenantContext.getCurrentTenantKey()); + // return WeaResult.success(null); + // } + // + // @PostMapping("/detail/list") + // @ApiOperation("个税申报表详情列表") + // @WeaPermission + // public WeaResult> listTaxDeclarationDetail(@RequestBody TaxDeclarationDetailListQueryParam queryParam) { + // WeaTable weaTable = taxDeclarationDetailWrapper.listPage(queryParam, TenantContext.getCurrentTenantKey()); + // return WeaResult.success(weaTable); + // } + // + // @PostMapping("/export") + // @ApiOperation("个税申报表相关信息") + // @WeaPermission + // public WeaResult> exportTaxDeclaration(@RequestParam(value = "taxDeclarationId") Long taxDeclarationId) { + // Map map = taxDeclarationExcelService.exportTaxDeclaration(taxDeclarationId, TenantContext.getCurrentTenantKey()); + // return WeaResult.success(map); + // } + + +} diff --git a/src/com/engine/salary/wrapper/TaxRateWrapper.java b/src/com/engine/salary/wrapper/TaxRateWrapper.java deleted file mode 100644 index fe8fb1e4b..000000000 --- a/src/com/engine/salary/wrapper/TaxRateWrapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.engine.salary.wrapper; - -import com.engine.common.util.ServiceUtil; -import com.engine.core.impl.Service; -import com.engine.salary.service.TaxRateBaseService; -import weaver.hrm.User; - -import java.util.Map; - -public class TaxRateWrapper extends Service { - - private TaxRateBaseService getService(User user) { - return (TaxRateBaseService) ServiceUtil.getService(TaxRateWrapper.class, user); - } - - - public Map listPage(Map stringObjectMap) { - - return null; - } -}