From 6646a2e4818f6fb98d7c6cb60aa64d349f3ebd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 2 Jun 2022 18:02:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8=E7=9A=84=E5=88=86?= =?UTF-8?q?=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxDeclaration/TaxDeclarationListCmd.java | 101 ------------------ .../taxdeclaration/po/TaxDeclarationPO.java | 18 ++-- .../taxdeclaration/TaxDeclarationMapper.xml | 6 ++ .../salary/service/TaxDeclarationService.java | 5 - .../impl/TaxDeclarationServiceImpl.java | 37 +++++-- .../wrapper/TaxDeclarationDetailWrapper.java | 16 +-- .../salary/wrapper/TaxDeclarationWrapper.java | 17 ++- 7 files changed, 56 insertions(+), 144 deletions(-) delete mode 100644 src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java diff --git a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java b/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java deleted file mode 100644 index 52433685c..000000000 --- a/src/com/engine/salary/cmd/taxDeclaration/TaxDeclarationListCmd.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.engine.salary.cmd.taxDeclaration; - -import com.cloudstore.eccom.result.WeaResultMsg; -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.component.SalaryWeaTable; -import com.engine.salary.entity.salaryarchive.po.TaxAgentPO; -import com.engine.salary.entity.taxdeclaration.TaxDeclaration; -import com.engine.salary.entity.taxrate.vo.TaxAgentTableVO; -import com.engine.salary.util.SalaryEntityUtil; -import com.engine.salary.util.db.DBType; -import com.fapiao.neon.model.in.Page; -import org.apache.commons.lang3.StringUtils; -import weaver.conn.RecordSet; -import weaver.hrm.User; - -import java.util.*; -import java.util.stream.Collectors; - -public class TaxDeclarationListCmd extends AbstractCommonCommand> { - - public TaxDeclarationListCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - - Map apidatas = new HashMap(16); - //查询个税申报表 - SalaryWeaTable table = new SalaryWeaTable(user, TaxDeclaration.class); - //sql条件 - String sqlWhere = makeSqlWhere(params,user); - table.setSqlwhere(sqlWhere); - - WeaResultMsg result = new WeaResultMsg(false); - result.putAll(table.makeDataResult()); - - result.success(); - //人员list - List list = table.makeDataResult().values().stream().collect(Collectors.toList()); - //SalaryWeaTable simpleEmployees = new SalaryWeaTable(user, SimpleEmployee.class); - //查询个税扣缴义务人 - - SalaryWeaTable taxAgentPOS = new SalaryWeaTable(user, TaxAgentTableVO.class); - List employeeIds = new ArrayList(); - - if(!table.makeDataResult().isEmpty()){ - //查询人员 - - //查询个税扣缴义务人 - - } - return result.getResultMap(); - - } - - /** - * sql条件 - * - * @param params - * @return - */ - private String makeSqlWhere(Map params,User user) { - DBType dbType = DBType.get(new RecordSet().getDBType()); - //租户key - String userId = user.getLoginid(); - String sqlWhere = "where delete_Type = 0 and tenantKey = userId"; - //区间查询 - String FromSalaryMonth = (String) params.get("FromSalaryMonth"); - String EndSalaryMonth = (String) params.get("EndSalaryMonth"); - if (SalaryEntityUtil.isNotNullOrEmpty(FromSalaryMonth)&&SalaryEntityUtil.isNotNullOrEmpty(EndSalaryMonth)) { - sqlWhere += "AND salary_month between to_date(FromSalaryMonth,'yyyy-mm') and to_date(EndSalaryMonth,'yyyy-mm')"; - } - return sqlWhere; - } - - /** - * sql条件 - * - * @param params - * @return - */ - private String makeSqlWhereAgent(Map params) { - DBType dbType = DBType.get(new RecordSet().getDBType()); - String sqlWhere = "where delete_Type = 0"; - //模糊查询 - String name = (String) params.get("name"); - if (StringUtils.isNotBlank(name)) { - sqlWhere += " AND name " + dbType.like(name); - } - return sqlWhere; - } -} diff --git a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java index 7836bff64..f810838ec 100644 --- a/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java +++ b/src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java @@ -6,15 +6,17 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Collection; import java.util.Date; /** - * @description: 个税申报记录 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 12/14/21 6:57 PM - * @version:v1.0 - */ + * 个税申报记录 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Data @Builder @NoArgsConstructor @@ -73,4 +75,8 @@ public class TaxDeclarationPO { //税款所属期 LocalDateRange salaryMonths; + + + + private Collection taxAgentIds; } diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml index d05ad50a3..0d9b5b529 100644 --- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml +++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationMapper.xml @@ -56,6 +56,12 @@ AND salary_month #{salaryMonths.endDate} + + AND tax_agent_id IN + + #{id} + + ORDER BY id DESC diff --git a/src/com/engine/salary/service/TaxDeclarationService.java b/src/com/engine/salary/service/TaxDeclarationService.java index 7aaf8dd5e..352a142b1 100644 --- a/src/com/engine/salary/service/TaxDeclarationService.java +++ b/src/com/engine/salary/service/TaxDeclarationService.java @@ -14,11 +14,6 @@ import java.util.Map; public interface TaxDeclarationService { - /** - * 分页列表 - */ - Map listPage(Map params); - PageInfo listPageByParam(TaxDeclarationListQueryParam queryParam); List countByTaxDeclarationId(Collection taxAgentIds); diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java index f670cfd9b..d188eb498 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java @@ -2,8 +2,12 @@ package com.engine.salary.service.impl; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.cmd.taxDeclaration.*; +import com.engine.salary.cmd.taxDeclaration.TaxDeclarationDeleteCmd; +import com.engine.salary.cmd.taxDeclaration.TaxDeclarationGetFormCmd; +import com.engine.salary.cmd.taxDeclaration.TaxDeclarationGetTaxDeclarationInfoCmd; +import com.engine.salary.cmd.taxDeclaration.TaxDeclarationUpdateCmd; import com.engine.salary.common.LocalDateRange; +import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.entity.taxdeclaration.TaxDeclaration; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam; @@ -14,6 +18,7 @@ import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.TaxAgentMapper; import com.engine.salary.mapper.taxdeclaration.TaxDeclarationMapper; import com.engine.salary.service.AddUpSituationService; +import com.engine.salary.service.TaxAgentService; import com.engine.salary.service.TaxDeclarationDetailService; import com.engine.salary.service.TaxDeclarationService; import com.engine.salary.util.SalaryDateUtil; @@ -37,23 +42,24 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration } private TaxDeclarationDetailService getTaxDeclarationDetailService(User user) { - return (TaxDeclarationDetailService) ServiceUtil.getService(TaxDeclarationDetailServiceImpl.class, user); + return ServiceUtil.getService(TaxDeclarationDetailServiceImpl.class, user); } private AddUpSituationService getAddUpSituationService(User user) { - return (AddUpSituationService) ServiceUtil.getService(AddUpSituationServiceImpl.class, user); + return ServiceUtil.getService(AddUpSituationServiceImpl.class, user); } - @Override - public Map listPage(Map params) { - return commandExecutor.execute(new TaxDeclarationListCmd(params, user)); + private TaxAgentService getTaxAgentService(User user) { + return ServiceUtil.getService(TaxAgentServiceImpl.class, user); } + @Override public PageInfo listPageByParam(TaxDeclarationListQueryParam queryParam) { + long currentEmployeeId = user.getUID(); + // 分页参数 TaxDeclarationPO po = TaxDeclarationPO.builder().build(); - PageInfo page = new PageInfo<>(); LocalDateRange localDateRange = new LocalDateRange(); if (Objects.nonNull(queryParam.getFromSalaryMonth())) { localDateRange.setFromDate(SalaryDateUtil.localDateToDate(queryParam.getFromSalaryMonth().atDay(1))); @@ -62,12 +68,25 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration localDateRange.setEndDate(SalaryDateUtil.localDateToDate(queryParam.getEndSalaryMonth().atEndOfMonth())); } po.setSalaryMonths(localDateRange); + + + // 分权 + Boolean openDevolution = getTaxAgentService(user).isNeedAuth(currentEmployeeId); + if (openDevolution) { + // 查询负责管理的个税扣缴义务人 + Collection taxAgentPOS = getTaxAgentService(user).listAllTaxAgents(currentEmployeeId); + if (CollectionUtils.isEmpty(taxAgentPOS)) { + return new PageInfo<>(new ArrayList<>()); + } + Set taxAgentIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId); + po.setTaxAgentIds(taxAgentIds); + } + // 查询个税申报表 SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List taxDeclarationPOS = getTaxDeclarationMapper().listSome(po); - page.setList(taxDeclarationPOS); + return new PageInfo<>(taxDeclarationPOS,TaxDeclarationPO.class); - return page; } //根据id查询taxAgents diff --git a/src/com/engine/salary/wrapper/TaxDeclarationDetailWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationDetailWrapper.java index 543f04052..b6d787b78 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationDetailWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationDetailWrapper.java @@ -1,31 +1,22 @@ package com.engine.salary.wrapper; -import com.cloudstore.eccom.pc.table.WeaTable; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.salary.component.SalaryWeaTable; -import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO; -import com.engine.salary.entity.taxdeclaration.TaxDeclaration; import com.engine.salary.entity.taxdeclaration.bo.TaxDeclarationDetailListColumn; import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationDetailListDTO; -import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO; -import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationWageListDTO; import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationDetailListQueryParam; -import com.engine.salary.enums.salarysob.IncomeCategoryEnum; import com.engine.salary.service.TaxDeclarationDetailService; -import com.engine.salary.service.TaxDeclarationExcelService; -import com.engine.salary.service.TaxDeclarationService; import com.engine.salary.service.impl.TaxDeclarationDetailServiceImpl; -import com.engine.salary.service.impl.TaxDeclarationExcelServiceImpl; import com.engine.salary.util.page.PageInfo; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import weaver.hrm.User; -import javax.annotation.Resource; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @@ -37,7 +28,6 @@ import java.util.stream.Collectors; @Slf4j - public class TaxDeclarationDetailWrapper extends Service { private TaxDeclarationDetailService getTaxDeclarationDetailService(User user) { diff --git a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java index 749a40987..7a43a05c9 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java @@ -44,18 +44,15 @@ import java.util.*; import java.util.stream.Collectors; /** - * @description: 个税申报表 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 1/23/22 5:50 PM - * @version:v1.0 - */ - + * 个税申报表 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ public class TaxDeclarationWrapper extends Service { - public TaxDeclarationWrapper() { - } - private TaxDeclarationService getTaxDeclarationService(User user) { return ServiceUtil.getService(TaxDeclarationServiceImpl.class, user); }