diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index 87bc2a29..b3ac2d73 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -75,18 +75,18 @@ public class SysUserServiceImpl extends ServiceImpl i @Override public PageUtils queryPage(Map params) { DynamicContextHolder.push(DbConstant.BASICS_READ); - String username = (String)params.get("username"); - String company = (String)params.get("company"); - String deptId = (String)params.get("deptId"); - String taxno = (String)params.get("taxno"); - Integer userType = (Integer)params.get("userType"); + String username = (String) params.get("username"); + String company = (String) params.get("company"); + String deptId = (String) params.get("deptId"); + String taxno = (String) params.get("taxno"); + Integer userType = (Integer) params.get("userType"); IPage page = this.page(new Query().getPage(params), - new QueryWrapper().like(StringUtils.isNotBlank(username), "username", username) - .eq(StringUtils.isNotBlank(deptId), "dept_id", deptId) - .eq(StringUtils.isNotBlank(company), "company", company) - .eq(StringUtils.isNotBlank(taxno), "taxno", taxno) - .eq(StringUtils.isNotBlank(taxno), "user_type", userType) - .apply(params.get(Constant.SQL_FILTER) != null, (String)params.get(Constant.SQL_FILTER))); + new QueryWrapper().like(StringUtils.isNotBlank(username), "username", username) + .eq(StringUtils.isNotBlank(deptId), "dept_id", deptId) + .eq(StringUtils.isNotBlank(company), "company", company) + .eq(StringUtils.isNotBlank(taxno), "taxno", taxno) + .eq(StringUtils.isNotBlank(taxno), "user_type", userType) + .apply(params.get(Constant.SQL_FILTER) != null, (String) params.get(Constant.SQL_FILTER))); List records = page.getRecords(); if (records != null && records.size() > 0) { @@ -285,11 +285,11 @@ public class SysUserServiceImpl extends ServiceImpl i } //获取组织编码 List companyEntitys = sysUserOrgService.getOrgsByUserId(userEntity.getUserId()); - if (companyEntitys != null && companyEntitys.size() > 0){ + if (companyEntitys != null && companyEntitys.size() > 0) { for (SysCompanyEntity companyEntity : companyEntitys) { if (companyEntity != null) { - if (StringHelper.isNotBlank(companyEntity.getCompanyCode()) && StringHelper.isNotBlank(companyEntity.getCompanyName())){ - String companyName ="("+companyEntity.getCompanyCode()+")"+companyEntity.getCompanyName(); + if (StringHelper.isNotBlank(companyEntity.getCompanyCode()) && StringHelper.isNotBlank(companyEntity.getCompanyName())) { + String companyName = "(" + companyEntity.getCompanyCode() + ")" + companyEntity.getCompanyName(); companyEntity.setCompanyName(companyName); } } @@ -357,8 +357,7 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 菜单路由转换 * - * @param childPerms - * 树状菜单信息 + * @param childPerms 树状菜单信息 * @return 转换后路由信息 */ private List toRouter(List childPerms) { @@ -397,7 +396,7 @@ public class SysUserServiceImpl extends ServiceImpl i router.setComponent(sysMenuEntity.getComponent()); router.setPath(sysMenuEntity.getUrl()); router.setMeta(new MetaVo(sysMenuEntity.getName(), sysMenuEntity.getIcon(), null, - sysMenuEntity.isNoCache(), null)); + sysMenuEntity.isNoCache(), null)); router.setName(StringUtils.capitalize(sysMenuEntity.getUrl().replaceAll("/", ""))); router.setMenuId(String.valueOf(sysMenuEntity.getMenuId())); childrenList.add(router); @@ -454,7 +453,7 @@ public class SysUserServiceImpl extends ServiceImpl i } private void toDeptOrgCode(User user, List orgCodeList, List queryDept) { - log.info("查询到的企业列表为:{}",queryDept); + log.info("查询到的企业列表为:{}", queryDept); String qsStatus = "0"; String productType = "0"; if (queryDept.size() > 0) { @@ -470,7 +469,7 @@ public class SysUserServiceImpl extends ServiceImpl i orgCodeList.addAll(oldTaxOrgCode); qsStatus = queryDept.get(0).getQsStatus(); productType = queryDept.get(0).getProductType(); - log.info("orgCodeList:{}",orgCodeList); + log.info("orgCodeList:{}", orgCodeList); user.setOrgCodes(orgCodeList); user.setQsStatus(qsStatus); user.setProductType(productType); @@ -479,12 +478,14 @@ public class SysUserServiceImpl extends ServiceImpl i private TaxOrgCode toTaxOrgCode(SysDeptEntity sysDeptEntity) { TaxOrgCode orgCode = new TaxOrgCode(); - orgCode.setTaxno(sysDeptEntity.getTaxno()); - orgCode.setTaxname(sysDeptEntity.getTaxname()); - orgCode.setOrgCode(sysDeptEntity.getOrgCode()); - orgCode.setCompany(sysDeptEntity.getCompany()); - orgCode.setAreaCode(sysDeptEntity.getAreaCode()); - orgCode.setIsPassword(sysDeptEntity.getIsPassword()); + if (StringUtils.isNotEmpty(sysDeptEntity.getTaxno())) { + orgCode.setTaxno(sysDeptEntity.getTaxno()); + orgCode.setTaxname(sysDeptEntity.getTaxname()); + orgCode.setOrgCode(sysDeptEntity.getOrgCode()); + orgCode.setCompany(sysDeptEntity.getCompany()); + orgCode.setAreaCode(sysDeptEntity.getAreaCode()); + orgCode.setIsPassword(sysDeptEntity.getIsPassword()); + } return orgCode; } @@ -562,7 +563,7 @@ public class SysUserServiceImpl extends ServiceImpl i public void uploadUser(SysUserEntity user) { if (SysConfig.ITAX_SWITCH.equals(AdminConfig.itaxSwitch) - && SysConfig.UserType.USET_TYPE_2.getCode().equals(user.getUserType())) { + && SysConfig.UserType.USET_TYPE_2.getCode().equals(user.getUserType())) { // 获取部门信息 SysDeptEntity sysDeptEntity = sysDeptService.getById(user.getDeptId()); Map map = new HashMap<>(9); @@ -607,9 +608,9 @@ public class SysUserServiceImpl extends ServiceImpl i for (SysUserEntity sysUserEntity : userList) { // 保存用户信息到redis redisUtils.set(RedisConstant.KEY_USER_MENU + sysUserEntity.getLoginname(), - this.getUserInfo(sysUserEntity), -1); + this.getUserInfo(sysUserEntity), -1); redisUtils.set(RedisConstant.KEY_USER_TOKEN + sysUserEntity.getLoginname(), - loginService.infoListRedis(sysUserEntity.getLoginname()), RedisUtils.NOT_EXPIRE); + loginService.infoListRedis(sysUserEntity.getLoginname()), RedisUtils.NOT_EXPIRE); } } // 刷新显示列表缓存、只刷新中心企业 @@ -649,8 +650,7 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 构建前端路由所需要的菜单 * - * @param menus - * 菜单列表 + * @param menus 菜单列表 * @return 路由列表 */ public List buildMenus(List menus) { @@ -700,8 +700,7 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 构建前端路由所需要的菜单 * - * @param menus - * 菜单列表 + * @param menus 菜单列表 * @return 路由列表 */ public List buildMenusSystem(List menus) { @@ -754,8 +753,7 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 转换按钮信息 * - * @param sysMenuEntity - * 菜单信息 + * @param sysMenuEntity 菜单信息 * @return 按钮信息 */ public ButtonQueryVo toButtonQuery(SysMenuEntity sysMenuEntity) { @@ -782,10 +780,8 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 根据父节点的ID获取所有子节点 * - * @param list - * 分类表 - * @param parentId - * 传入的父节点ID + * @param list 分类表 + * @param parentId 传入的父节点ID * @return String */ @Override @@ -812,10 +808,8 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 递归列表 * - * @param list - * 菜单列 - * @param t - * 菜单信息 + * @param list 菜单列 + * @param t 菜单信息 */ private void recursionFn(List list, SysMenuEntity t) { // 得到子节点列表 @@ -854,8 +848,7 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 是否为系统信息 * - * @param menu - * 菜单信息 + * @param menu 菜单信息 * @return 结果 */ public boolean isMeunFrame(SysMenuEntity menu) { @@ -865,8 +858,7 @@ public class SysUserServiceImpl extends ServiceImpl i /** * 菜单信息 * - * @param menuEntities - * 菜单信息 + * @param menuEntities 菜单信息 * @return 菜单信息 */ public Map toMenuList(List menuEntities) { @@ -874,20 +866,20 @@ public class SysUserServiceImpl extends ServiceImpl i if (menuEntities.size() > 0) { for (SysMenuEntity sysMenuEntity : menuEntities) { if (0 == sysMenuEntity.getType() - && (sysMenuEntity.getChildren() != null && sysMenuEntity.getChildren().size() > 0)) { + && (sysMenuEntity.getChildren() != null && sysMenuEntity.getChildren().size() > 0)) { List childrenDirList = sysMenuEntity.getChildren(); if (childrenDirList.size() > 0) { for (SysMenuEntity childrenDir : childrenDirList) { List childrenMenuList = childrenDir.getChildren(); if (1 == childrenDir.getType() - && (childrenMenuList != null && childrenMenuList.size() > 0)) { + && (childrenMenuList != null && childrenMenuList.size() > 0)) { for (SysMenuEntity childrenMenu : childrenMenuList) { if (2 == childrenMenu.getType()) { ButtonQueryVo buttonQueryVo = this.toButtonQuery(childrenMenu); childrenMenu.setMeta( - new MetaVo(childrenMenu.getName(), "", buttonQueryVo.getButtonVos(), - childrenMenu.isNoCache(), buttonQueryVo.getQueryVos())); + new MetaVo(childrenMenu.getName(), "", buttonQueryVo.getButtonVos(), + childrenMenu.isNoCache(), buttonQueryVo.getQueryVos())); map.put(childrenMenu.getUrl().replaceAll("/", ""), childrenMenu); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index f4c500de..4237364a 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -141,6 +141,9 @@ public class BaseInvoiceController extends AbstractController { String businessCode = (String)map.get("businessCode"); String qsr = (String)map.get("qsr"); String rzhr = (String)map.get("rzhr"); +// String sortPzbh = String.valueOf(map.get("sortPzbh")); +// String sortBzdh = String.valueOf(map.get("sortBzdh")); +// String sortKprq = String.valueOf(map.get("sortKprq")); String taxRate = String.valueOf(map.get("taxRate")); log.info("taxRate={}",taxRate); String inAccountStatus = (String)map.get("inAccountStatus"); @@ -169,6 +172,15 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); pramsMap.put("company", map.get("company")); pramsMap.put("menuId", map.get("menuId")); +// if(StringUtils.isNotEmpty(sortPzbh)) { +// pramsMap.put("sortPzbh", sortPzbh); +// } +// if(StringUtils.isNotEmpty(sortBzdh)) { +// pramsMap.put("sortBzdh", sortBzdh); +// } +// if(StringUtils.isNotEmpty(sortKprq)) { +// pramsMap.put("sortKprq", sortKprq); +// } pramsMap.put("xfmc", xfmc); pramsMap.put("qsr", qsr); if (StringUtils.isNotBlank(rzhr)) { @@ -202,7 +214,8 @@ public class BaseInvoiceController extends AbstractController { if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { gfshList.add(gfsh); } else { - gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); +// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + gfshList = getGfshList(gfshList,getUserInfo().getCompanyCodes()); } pramsMap.put("gfsh", gfshList); @@ -497,6 +510,9 @@ public class BaseInvoiceController extends AbstractController { String qsksrq = (String)map.get("qsksrq"); String qsjsrq = (String)map.get("qsjsrq"); String xfmc = (String)map.get("xfmc"); + String sortPzbh = String.valueOf(map.get("sortPzbh")); + String sortBzdh = String.valueOf(map.get("sortBzdh")); + String sortKprq = String.valueOf(map.get("sortKprq")); String position = (String)map.get("position"); String fpzt = (String)map.get("invoiceStatus"); String sfkrz = (String)map.get("sfkrz"); @@ -553,7 +569,20 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("imageNumber", map.get("imageNumber")); pramsMap.put("suspendStatus",suspendStatus); pramsMap.put("suspendDate",suspendDate); + pramsMap.put("sortPzbh",sortPzbh); + pramsMap.put("sortBzdh",sortBzdh); + pramsMap.put("sortKprq",sortKprq); pramsMap.put("bzr",bzr); + if(StringUtils.isNotEmpty(sortPzbh)) { + pramsMap.put("sortPzbh", sortPzbh); + } + if(StringUtils.isNotEmpty(sortBzdh)) { + pramsMap.put("sortBzdh", sortBzdh); + } + if(StringUtils.isNotEmpty(sortKprq)) { + pramsMap.put("sortKprq", sortKprq); + } + if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { String accountPeriod = map.get("accountPeriod").toString().substring(0,7); pramsMap.put("accountPeriod", accountPeriod); @@ -581,24 +610,6 @@ public class BaseInvoiceController extends AbstractController { // rates = convertRates(taxRate,rates); pramsMap.put("taxRate",taxRate); } - List gfshList = new ArrayList<>(); - if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { - gfshList.add(gfsh); - log.info("手工认证有税号"); - } else { - gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); - - log.info("手工认证无税号{}",UserInfoUtil.getGfshAll(getUserInfo().getOrg())); - } - pramsMap.put("gfsh", gfshList); - - boolean flag = checkList(gfshList); - - log.info("gfshList.size(){}",gfshList.size()); - if (flag){ - pramsMap.put("sign","88"); - log.info("登陆账号无税号"); - } //所属组织 // List companyCodeList = new ArrayList<>(); @@ -608,8 +619,10 @@ public class BaseInvoiceController extends AbstractController { // companyCodeList = getUserInfo().getCompanyCodes(); // log.info("获取到的组织信息{}",companyCodeList); // } + List companyCodes = getUserInfo().getCompanyCodes(); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ - pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + pramsMap.put("companyCodes",companyCodes); log.info("组织机构====>{}",pramsMap.get("companyCodes")); } if (StringUtils.isNotBlank(companyCode)){ @@ -617,6 +630,15 @@ public class BaseInvoiceController extends AbstractController { } + List gfshList = new ArrayList<>(); + if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { + gfshList.add(gfsh); + log.info("手工认证有税号"); + } else { + gfshList = getGfshList(gfshList,companyCodes); + log.info("手工认证无税号{}",gfshList); + } + pramsMap.put("gfsh", gfshList); if (!StringUtils.isBlank(invoiceType)) { if (!"99".equals(invoiceType)) { @@ -709,6 +731,11 @@ public class BaseInvoiceController extends AbstractController { } + private List getGfshList(List gfshList, List companyCodes) { + gfshList = baseInvoiceManualCheckService.getGfshList(gfshList,companyCodes); + return gfshList; + } + private List convertRates(String taxRate,List rates) { switch (taxRate) { case "0": diff --git a/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java b/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java new file mode 100644 index 00000000..c53a2d1a --- /dev/null +++ b/dxhy-base/src/main/java/com/dxhy/base/dao/SysDeptAuthDao.java @@ -0,0 +1,111 @@ +package com.dxhy.base.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dxhy.base.entity.SysDeptEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 部门管理 + * + * @author jiaohongyang + */ +@Mapper +public interface SysDeptAuthDao extends BaseMapper { + /** + * 根据集团编码查询税号 + * + * @author 陈刚扬 + * @date 2020/12/4 + * @param company + * @param orgType + * @return java.util.List + */ + List selectDeptByCompany(@Param("company") String company, @Param("orgType") String orgType); + + /** + * 根据集团编码查询部门信息 + * + * @param company + * 集团编码 + * @return 部门信息 + */ + List queryList(@Param("company") String company); + + /** + * 根据集团编码查询用户关联部门信息 + * + * @param company + * 集团编码 + * @return 部门信息 + */ + List queryListUser(@Param("company") String company); + + /** + * 根据集团编码查询上级部门信息 + * + * @param company + * 集团编码 + * @return 部门信息 + */ + List queryListParent(@Param("company") String company); + + /** + * 查询子部门ID列表 + * + * @param parentId + * 上级部门ID + * @return 部门信息 + */ + List queryDetpIdList(@Param("parentId") Long parentId); + + /** + * 根据上级ID查询部门信息 + * + * @param parentId + * 集团编码 + * @return 部门信息 + */ + List queryDeptParentId(@Param("parentId") Long parentId); + + /** + * 获取部门信息 + * + * @return 部门信息 + */ + List queryDeptList(); + + /** + * 根据集团编码修改部分信息 + * + * @param company + * 集团编码 + * @param isCollext + * 是否采集 + * @param aceKey + * key + * @param aceId + * id + * @param dbName + * 数据库 + * @param qsStatus + * 签收状态 + */ + void updateDeptCompany(@Param("company") String company, @Param("isCollext") String isCollext, + @Param("aceKey") String aceKey, @Param("aceId") String aceId, @Param("dbName") String dbName, + @Param("qsStatus") String qsStatus); + + List getOrgCodeList(Long userId); + + /** + * 查询id与税号对应list + * + * @return 部门信息 + */ + List queryTaxnoList(); + + List queryParentIdList(); + +} diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/SysDeptEntity.java b/dxhy-base/src/main/java/com/dxhy/base/entity/SysDeptEntity.java new file mode 100644 index 00000000..e94c0007 --- /dev/null +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/SysDeptEntity.java @@ -0,0 +1,109 @@ +package com.dxhy.base.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 部门管理 + * + * @author jiaohongyang + */ +@Data +@TableName("sys_dept") +public class SysDeptEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 部门ID + */ + @TableId + private String deptId; + /** + * 上级部门ID，一级部门为0 + */ + private String parentId; + /** + * 部门名称 + */ + private String name; + /** + * 上级部门名称 + */ + @TableField(exist = false) + private String parentName; + private Integer orderNum; + + private String taxno; + private String taxname; + private String linkman; + private String phone; + private String address; + private String bank; + private String account; + private String company; + private String orgType; + private String deptType; + private String upgradeStatus; + + /** + * 是否查验 0-- 不查验 1---查验 + */ + private String checkStatus; + /** + * 是否采集状态 0 -- 不采集 1--采集 + */ + private String cjStatus; + /** + * 是否签收认证 0 -- 不签收认证 1 -- 签收认证 + */ + private String qsStatus; + /** + * 所选数据库名称 + */ + private String dbName; + + /** + * 兼容大企业平台添加 + */ + private String aceKey; + /** + * 兼容大企业平台添加 + */ + private String aceId; + /** + * 是否采集全票面 0-- 不采集全票面 1--采集全票面 + */ + private String isCollext; + /** + * 机构编码 + */ + private String orgCode; + /** + * 地区编码 + */ + private String areaCode; + /** + * 是否需要确认密码 + */ + private String isPassword; + /** + * 确认密码 + */ + private String password; + + private Date updateTime; + + private Date createTime; + + private String autoRz; + + private String productType; + @TableField(exist = false) + private List children; +} diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index ea23ac18..f959eee5 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -54,6 +54,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { log.info("认证查询列表-传入的参数为:{}",pramsMap); + long enter = System.currentTimeMillis(); DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); JSONObject json; @@ -99,6 +100,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl gfshList1 = new ArrayList<>(); List curList = baseTDxRecordInvoiceDao.selectDksh(pramsMap); log.info("认证查询列表-返回的所属期列表为:{}",curList); @@ -116,7 +119,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectByPramsMap(pramsMap); - log.info("认证查询列表-返回的发票列表为:{}",pageList); + log.info("认证查询-查询列表信息耗时:{}",System.currentTimeMillis()-enter); PageInfo pageInfo = new PageInfo<>(pageList); // 用于页面返回list对象 if (pageList.size() > 0) { @@ -213,6 +216,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); log.info("resultList {}",resultList); json.put("datalist", resultList); + log.info("认证查询-合计耗时:{}",System.currentTimeMillis()-enter); } } catch (Exception e) { diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckService.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckService.java index 603085d3..0d97a656 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckService.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckService.java @@ -63,4 +63,6 @@ public interface BaseInvoiceManualCheckService extends MpBaseService pramsMap); + List getGfshList(List gfshList,List companyCode); + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index de7cc019..a9a97fcc 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -9,12 +9,12 @@ import java.util.stream.Collectors; import javax.annotation.Resource; +import com.dxhy.base.dao.SysDeptAuthDao; +import com.dxhy.base.entity.SysDeptEntity; import com.dxhy.common.constant.DictConstant; -import com.dxhy.common.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; @@ -28,8 +28,6 @@ import com.dxhy.base.model.BaseBeforegxRespVO; import com.dxhy.base.model.BaseSggxCxRespVO; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; -import com.dxhy.common.enums.FpqsjgEnum; -import com.dxhy.common.enums.QsfsEnum; import com.dxhy.common.service.DictdetaServcice; import com.dxhy.common.service.TabulateRedisService; import com.dxhy.common.service.impl.MpBaseServiceImpl; @@ -37,7 +35,6 @@ import com.dxhy.common.util.AmountFormatUtil; import com.dxhy.common.util.MathUtil; import com.dxhy.common.util.StringHelper; import com.dxhy.common.vo.Business; -import com.dxhy.common.vo.DictdetaModel; import com.dxhy.common.vo.Tax; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -46,37 +43,40 @@ import com.github.pagehelper.PageInfo; * 手动勾选查询service实现类 * * @author kangzq - * @date 2019年5月11日 * @version 1.0 + * @date 2019年5月11日 */ @SuppressWarnings({"AlibabaLowerCamelCaseVariableNaming", "AlibabaUndefineMagicConstant", "AlibabaMethodTooLong"}) @Slf4j @Service("baseInvoiceManualCheckService") public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl - implements BaseInvoiceManualCheckService { + implements BaseInvoiceManualCheckService { @Resource private BaseTDxTaxCurrentDao baseTDxTaxCurrentDao; @Resource private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao; @Resource + private SysDeptAuthDao sysDeptAuthDao; + @Resource private DictdetaServcice dictdetaServcice; @Resource private TabulateRedisService tabulateRedisService; @Override public String selectByManualCheck(Map pramsMap, int curr, int size) { - log.info("入参是:{}",pramsMap); + long enter = System.currentTimeMillis(); + log.info("入参是:{}", pramsMap); JSONObject json; DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { - String company = (String)pramsMap.get("company"); - String menuId = (String)pramsMap.get("menuId"); + String company = (String) pramsMap.get("company"); + String menuId = (String) pramsMap.get("menuId"); json = tabulateRedisService.getTabulateMenu(company, menuId); List voList = new ArrayList<>(); - List gfshList = (List)pramsMap.get("gfsh"); - log.info("购方税号{}",gfshList); - String qsflag = (String)pramsMap.get("qsflag"); + List gfshList = (List) pramsMap.get("gfsh"); + log.info("购方税号{}", gfshList); + String qsflag = (String) pramsMap.get("qsflag"); List gfshList1 = new ArrayList<>(); if (gfshList.size() > 0) { List curList = super.baseMapper.selectDksh(pramsMap); @@ -88,7 +88,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl hjList = super.baseMapper.selectHj(pramsMap); + log.info("手工认证 查询统计信息耗时:{}", System.currentTimeMillis() - start); BaseTDxRecordInvoice hjxx = hjList.get(0); hjsl = hjxx.getSfygx(); if (!"0".equals(hjsl)) { @@ -123,16 +125,21 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectSggxcx(pramsMap); + log.info("手工认证 查询列表信息耗时:{}", System.currentTimeMillis() - start1); PageInfo pageInfo = new PageInfo<>(pageList); - log.info("返回的列表为:{}",pageList); - + log.info("返回的列表为:{}", pageList); + log.info("查询耗时:{}", System.currentTimeMillis() - enter); // 转化为页面展示对象 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (pageList.size() > 0) { - List taxList = (List)pramsMap.get("taxList"); + List taxList = (List) pramsMap.get("taxList"); List taxnoList = new ArrayList<>(); if (taxList != null && taxList.size() > 0) { for (Tax tax : taxList) { @@ -142,7 +149,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl businessList = (List)pramsMap.get("business"); + List businessList = (List) pramsMap.get("business"); int start = new Long(pageInfo.getStartRow()).intValue(); for (int i = 0; i < pageList.size(); i++) { BaseSggxCxRespVO vo = new BaseSggxCxRespVO(); @@ -157,17 +164,17 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); + log.info("inaccountStatus==>{}", pageList.get(i).getInAccountStatus()); if ("1".equals(pageList.get(i).getInAccountStatus())) { vo.setInAccountStatus("已入账"); } else { vo.setInAccountStatus("未入账"); } String suspendStatus = pageList.get(i).getSuspendStatus(); - if ("1".equals(suspendStatus)){ + if ("1".equals(suspendStatus)) { vo.setSuspendStatus("是"); - }else { + } else { vo.setSuspendStatus("否"); } vo.setSuspendDate(pageList.get(i).getSuspendDate()); vo.setBzr(pageList.get(i).getBzr()); - vo.setPaymentStatus(dictdetaServcice.queryDictName(DictConstant.FK_STATUS,pageList.get(i).getPaymentStatus())); + vo.setPaymentStatus(dictdetaServcice.queryDictName(DictConstant.FK_STATUS, pageList.get(i).getPaymentStatus())); vo.setPaymentDate(pageList.get(i).getPaymentDate()); vo.setGfmc(pageList.get(i).getGfName()); vo.setXfmc(pageList.get(i).getXfName()); @@ -231,18 +238,18 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl businessList) { String businessName = ""; if (!StringHelper.isBlank(businessCode) && businessList != null && businessList.size() > 0) { for (Business business : businessList) { if (!StringHelper.isBlank(business.getBusinessCode()) - && business.getBusinessCode().equals(businessCode)) { + && business.getBusinessCode().equals(businessCode)) { businessName = StringHelper.trim(business.getBusinessName(), ""); break; } @@ -415,7 +419,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl pramsMap) { - log.info("入参是:{}",pramsMap); + log.info("入参是:{}", pramsMap); JSONObject json = new JSONObject(); DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { - String company = (String)pramsMap.get("company"); - String menuId = (String)pramsMap.get("menuId"); - if (StringUtils.isNotBlank(menuId)){ + String company = (String) pramsMap.get("company"); + String menuId = (String) pramsMap.get("menuId"); + if (StringUtils.isNotBlank(menuId)) { json = tabulateRedisService.getTabulateMenu(company, menuId); } - List gfshList = (List)pramsMap.get("gfsh"); + List gfshList = (List) pramsMap.get("gfsh"); String sign = (String) pramsMap.get("sign"); //如果有自己的税号则选择出在未申请抵扣的税号 - if (!"88".equals(sign)){ + if (!"88".equals(sign)) { List gfshList1 = new ArrayList<>(); if (gfshList.size() > 0) { List curList = super.baseMapper.selectDksh(pramsMap); @@ -473,12 +477,12 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpltotalPage){ + if (curr > totalPage) { curr = totalPage; } - curr = (curr -1)*size; - pramsMap.put("curr",curr); + curr = (curr - 1) * size; + pramsMap.put("curr", curr); } List pageList = super.baseMapper.selectInTellingCheck(pramsMap); - if (pageList == null || pageList.size() == 0){ - json.put("message","无可操作的数据"); - json.put("code","501"); + if (pageList == null || pageList.size() == 0) { + json.put("message", "无可操作的数据"); + json.put("code", "501"); return super.responseResult(json); } PageInfo pageInfo = new PageInfo<>(pageList); - log.info("返回的列表为:{}",pageList); + log.info("返回的列表为:{}", pageList); // 转化为页面展示对象 List returnList = new ArrayList<>(); //记录数量 int count = 1; //税额上限 - List businessList = (List)pramsMap.get("business"); + List businessList = (List) pramsMap.get("business"); if (pageList.size() > 0) { - List taxList = (List)pramsMap.get("taxList"); + List taxList = (List) pramsMap.get("taxList"); List taxnoList = new ArrayList<>(); if (taxList != null && taxList.size() > 0) { for (Tax tax : taxList) { @@ -570,13 +573,62 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl getGfshList(List gfshList, List companyCodes) { + DynamicContextHolder.push(DbConstant.BASICS_READ); + List taxnoList = sysDeptAuthDao.queryTaxnoList(); + List parentIdList = sysDeptAuthDao.queryParentIdList(); + + Map taxnoMap = taxnoList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, SysDeptEntity::getTaxno)); + Map parentIdMap = parentIdList.stream().collect(Collectors.toMap(SysDeptEntity::getDeptId, e -> e.getParentId() == null ? "" : e.getParentId())); + + log.info("taxnoMap={},parentIdMap={}", taxnoMap, parentIdMap); + + String gfsh = ""; + for (String companyCode : companyCodes) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("org_code", companyCode); + List sysDeptEntityList = sysDeptAuthDao.selectList(wrapper); + SysDeptEntity sysDeptEntity = sysDeptEntityList.get(0); + if (sysDeptEntity != null) { + String dId = sysDeptEntity.getDeptId(); + log.info("获取deptId为:{}", dId); + if (StringUtils.isNotEmpty(dId)) { + gfsh = getGfsh(dId, taxnoMap, parentIdMap); + if (StringUtils.isNotEmpty(gfsh)) + gfshList.add(gfsh); + log.info("获取的税号为：{}", gfsh); + } + } + } + log.info("购方税号list为：{}", gfshList); + + + return gfshList; + } + + private String getGfsh(String deptId, Map taxnoMap, Map parentIdMap) { + String taxno = ""; + if (StringUtils.isNotEmpty(deptId)) { + log.info("deptId={}", deptId); + taxno = taxnoMap.get(deptId); + + if (StringUtils.isEmpty(taxno)) { + deptId = parentIdMap.get(deptId); + log.info("获取map中的deptId:{}", deptId); + getGfsh(deptId, taxnoMap, parentIdMap); + } + } + return taxno; + } + public BaseSggxCxRespVO getBaseSggxCxRespVO(BaseTDxRecordInvoice baseTDxRecordInvoice, int count, List taxnoList, List businessList) { BaseSggxCxRespVO vo = new BaseSggxCxRespVO(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -618,7 +670,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl queryRecord = new QueryWrapper<>(); queryRecord.eq("uuid", uuid); BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord); - if (StringHelper.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ + if (rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString()); } if (rdxRecordInvoice != null) { diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 6e4af301..255c73fa 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -74,7 +74,7 @@ voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,t.tax_rate from t_dx_record_invoice t WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status in ('2','3','4') @@ -241,7 +241,27 @@ and t.tax_rate like '%,%' + order by t.invoice_date desc + + + + + + + + + + + + + + + + + + + + select t1.*,(select t2.name from sys_dept t2 where t2.dept_id=t1.parent_id)parentName from sys_dept t1 + where (t1.org_type != '8' and t1.org_type != '9') + + and t1.company = #{company} + + + + + + + + + + + + + + + update + sys_dept + set qs_status = #{qsStatus}, + db_name = #{dbName}, + ace_key = #{aceKey}, + ace_id = #{aceId}, + is_collext = #{isCollext} + where company = #{company} + and org_type != '1' + + + + + + + + + + + + diff --git a/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java b/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java index 7cf18049..a57096ad 100644 --- a/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java +++ b/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java @@ -34,7 +34,6 @@ public class DictdetaServciceImpl implements DictdetaServcice { @Override public String queryDictName(String type,String code) { - log.info("type={},code={}",type,code); String dictJson = redisUtils.get(RedisConstant.KEY_DICT + type); List dictdetaModels = JSON.parseArray(dictJson, DictdetaModel.class); Map collect = dictdetaModels.stream().collect(Collectors.toMap(DictdetaModel::getDictcode, DictdetaModel::getDictname)); diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java index e788137d..88c856de 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/FtpDownloadController.java @@ -97,7 +97,9 @@ public class FtpDownloadController extends AbstractController { if ("1".equals(serviceType)) { response.setContentType(this.getContentType(fileName)); } else { - response.setContentType("application/octet-stream"); +// response.setContentType("application/octet-stream"); +// response.setContentType("application/vnd.ms-excel"); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); } response.setHeader("Content-disposition", "attachment; filename=" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1")); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java index 4bbfaee2..1421d079 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Resource; +import com.dxhy.common.util.AmountFormatUtil; import com.dxhy.core.service.export.PoolPaperService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -82,7 +83,13 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl dataArray[7] = pageList.get(i).getXfName(); dataArray[8] = pageList.get(i).getInvoiceAmount(); dataArray[9] = pageList.get(i).getTaxAmount(); - dataArray[10] = pageList.get(i).getDkTaxAmount(); + + if (pageList.get(i).getDkTaxAmount() != null) { + dataArray[10] = AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getDkTaxAmount())); + } else { + dataArray[10] = AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount())); + } + dataArray[11] = dictdetaServcice.queryDictName(DictConstant.QS_STATUS, pageList.get(i).getQsStatus()); dataArray[12] = pageList.get(i).getQsDate(); dataArray[13] = dictdetaServcice.queryDictName(DictConstant.QS_TYPE, pageList.get(i).getQsType()); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java index c2b775a8..9c0c6796 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java @@ -169,14 +169,18 @@ public class FpcjhzExportThread extends BaseThread { excelFile.append(ftpFileName.toString()); // 递归导出数据到excel - this.cicleExport(pramsMap, default_curr, excelFile.toString(), jsonObject); - - // FTP文件存储路径 - String[] toDay = DateUtil.today().split("-"); - String ftpFilePath = fileService.getPathPrefix() + userName + "/" + "excelFile/" + toDay[0] + "/" - + toDay[1] + "/" + toDay[2] + "/" + ftpFileName.toString(); - // 文件上传ftp - fileService.uploadFile(ftpFilePath, excelFile.toString()); + String ftpFilePath = ""; + String rtnMsg = this.cicleExport(pramsMap, default_curr, excelFile.toString(), jsonObject); + if("ok".equals(rtnMsg)) { + // FTP文件存储路径 + String[] toDay = DateUtil.today().split("-"); + ftpFilePath = fileService.getPathPrefix() + userName + "/" + "excelFile/" + toDay[0] + "/" + + toDay[1] + "/" + toDay[2] + "/" + ftpFileName.toString(); + // 文件上传ftp + fileService.uploadFile(ftpFilePath, excelFile.toString()); + }else{ + ftpFilePath = rtnMsg; + } // 设置成功消息内容 msg.put("title", super.getSuccTitle(title)); @@ -222,12 +226,15 @@ public class FpcjhzExportThread extends BaseThread { * */ - private boolean cicleExport(Map pramsMap, int curr, String excelFile, JSONObject jsonObject) + private String cicleExport(Map pramsMap, int curr, String excelFile, JSONObject jsonObject) throws Exception { // 查询指定页数的数据 JSONObject pageData = fpcjService.selectByGfshAndCjrq(pramsMap, curr, default_size); boolean hasNext = pageData.getBooleanValue("hasNext"); List dataList = (List)pageData.get("datalist"); + if(dataList.size() > 5000){ + return "数据不能超过5000条"; + } boolean firstPage = false; if (curr == default_curr) { @@ -243,7 +250,7 @@ public class FpcjhzExportThread extends BaseThread { // 写入当前页数据 ExcelPoiUtil.exportListArrayToExcel1(excelFile, title, jsonObject, dataList, firstPage, false); // 更新页数 - return cicleExport(pramsMap, nextPage, excelFile, jsonObject); + cicleExport(pramsMap, nextPage, excelFile, jsonObject); } else { // 写入最后一页数据 FpcjCjhzRespVO vo = new FpcjCjhzRespVO(); @@ -253,7 +260,7 @@ public class FpcjhzExportThread extends BaseThread { vo.setSe(hjse); dataList.add(vo); ExcelPoiUtil.exportListArrayToExcel1(excelFile, title, jsonObject, dataList, firstPage, true); - return hasNext; } + return "ok"; } } diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index a3293a0d..89d67651 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -100,7 +100,6 @@ and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status != '0' - and t.rzh_yesorno != '0' and t.company = #{company} and t.gf_tax_no in @@ -259,12 +258,6 @@ and t.account_period = #{accountPeriod} - - and t.tax_rate = #{taxRate} - - - and t.tax_rate like '%,%' - order by t.rzh_date desc,t.invoice_date desc + + + + update t_dx_record_invoice + set tax_rate = #{pramsMap.taxRate} + where uuid = #{pramsMap.uuid} + + diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java index 3133ba1f..7d579dbd 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpmxcxServiceImpl.java @@ -37,6 +37,7 @@ public class ExtFpmxcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json; DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { @@ -49,6 +50,7 @@ public class ExtFpmxcxServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectByPramsMap(pramsMap); + log.info("发票明细查询-查询列表信息耗时:{}",System.currentTimeMillis()-enter); PageInfo pageInfo = new PageInfo<>(pageList); List resultList = pageInfo.getList(); if (resultList.size() > 0) { @@ -103,6 +105,7 @@ public class ExtFpmxcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json; DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); log.info("发票综合查询-传入的参数为:{}",pramsMap); @@ -69,11 +70,13 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectByPramsMap(pramsMap); log.info("返回的发票信息为:{}",pageList); + log.info("发票综合查询-查询列表信息耗时:{}",System.currentTimeMillis()-enter); PageInfo pageInfo = new PageInfo<>(pageList); List resultList = pageInfo.getList(); // 用于页面返回list对象 @@ -135,6 +138,7 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json; DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); @@ -112,10 +113,12 @@ public class ExtRzrbcxServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectBbycfpbbHj(pramsMap); + log.info("发票认证日报-查询列表信息耗时:{}",System.currentTimeMillis()-enter); PageInfo pageInfo = new PageInfo<>(pageList); // 用于页面返回list对象 if (pageList.size() > 0) { @@ -145,6 +148,7 @@ public class ExtRzrbcxServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json; DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); @@ -74,11 +75,13 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.selectByPramsMap(pramsMap); log.info("数据库查询结果pageList {}",pageList); + log.info("异常发票查询-查询列表信息耗时:{}",System.currentTimeMillis()-enter); PageInfo pageInfo = new PageInfo<>(pageList); // 用于页面返回list对象 if (pageList.size() > 0) { @@ -127,6 +130,7 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); json.put("datalist", resultList); + log.info("异常发票查询-合计耗时:{}",System.currentTimeMillis()-enter); } catch (Exception e) { // 统一设置操作异常标识 diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java index 295faef6..c1503405 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java @@ -40,6 +40,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl paramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json = new JSONObject(); DynamicContextHolder.push(paramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { @@ -70,11 +71,13 @@ public class TicketServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.queryTickets(paramsMap); PageInfo pageInfo = new PageInfo<>(pageList); + log.info("实名客票-查询列表信息耗时:{}",System.currentTimeMillis()-enter); // 用于页面返回list对象 if (pageList.size() > 0) { @@ -158,6 +161,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); json.put("datalist", resultList); + log.info("实名客票-合计耗时:{}",System.currentTimeMillis()-enter); } catch (Exception e) { // 统一设置操作异常标识 json = super.errorResult(e); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 3765480e..e2aab245 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -44,6 +44,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json = new JSONObject(); DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { @@ -77,10 +78,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.listAddTaxInvoice(pramsMap); PageInfo pageInfo = new PageInfo<>(pageList); + log.info("进项增值税票池-查询列表信息耗时:{}",System.currentTimeMillis()-enter); // 用于页面返回list对象 if (pageList != null && pageList.size() > 0) { @@ -203,6 +206,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); json.put("datalist", resultList); + log.info("进项增值税票池-合计耗时:{}",System.currentTimeMillis()-enter); } catch (Exception e) { // 统一设置操作异常标识 json = super.errorResult(e); @@ -212,6 +216,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { + long enter = System.currentTimeMillis(); JSONObject json = new JSONObject(); DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); try { @@ -242,12 +247,14 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.listOtherInvoice(pramsMap); log.info("查询结果为 {}",pageList); PageInfo pageInfo = new PageInfo<>(pageList); + log.info("其他客票-查询列表信息耗时:{}",System.currentTimeMillis()-enter); // 用于页面返回list对象 if (pageList != null && pageList.size() > 0) { int start = (int)pageInfo.getStartRow(); @@ -295,6 +302,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl resultList = pageInfo.getList(); json.put("datalist", resultList); + log.info("其他客票-合计耗时:{}",System.currentTimeMillis()-enter); } catch (Exception e) { // 统一设置操作异常标识 json = super.errorResult(e); diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/dao/SysDeptDao.java b/dxhy-sign/src/main/java/com/dxhy/sign/dao/SysDeptDao.java index 48ea682d..62ab0fb0 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/dao/SysDeptDao.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/dao/SysDeptDao.java @@ -3,6 +3,9 @@ package com.dxhy.sign.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dxhy.sign.entity.SysDeptEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 部门管理 @@ -11,5 +14,88 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SysDeptDao extends BaseMapper { + /** + * 根据集团编码查询税号 + * + * @author 陈刚扬 + * @date 2020/12/4 + * @param company + * @param orgType + * @return java.util.List + */ + List selectDeptByCompany(@Param("company") String company, @Param("orgType") String orgType); + + /** + * 根据集团编码查询部门信息 + * + * @param company + * 集团编码 + * @return 部门信息 + */ + List queryList(@Param("company") String company); + + /** + * 根据集团编码查询用户关联部门信息 + * + * @param company + * 集团编码 + * @return 部门信息 + */ + List queryListUser(@Param("company") String company); + + /** + * 根据集团编码查询上级部门信息 + * + * @param company + * 集团编码 + * @return 部门信息 + */ + List queryListParent(@Param("company") String company); + + /** + * 查询子部门ID列表 + * + * @param parentId + * 上级部门ID + * @return 部门信息 + */ + List queryDetpIdList(@Param("parentId") Long parentId); + + /** + * 根据上级ID查询部门信息 + * + * @param parentId + * 集团编码 + * @return 部门信息 + */ + List queryDeptParentId(@Param("parentId") Long parentId); + + /** + * 获取部门信息 + * + * @return 部门信息 + */ + List queryDeptList(); + + /** + * 根据集团编码修改部分信息 + * + * @param company + * 集团编码 + * @param isCollext + * 是否采集 + * @param aceKey + * key + * @param aceId + * id + * @param dbName + * 数据库 + * @param qsStatus + * 签收状态 + */ + void updateDeptCompany(@Param("company") String company, @Param("isCollext") String isCollext, + @Param("aceKey") String aceKey, @Param("aceId") String aceId, @Param("dbName") String dbName, + @Param("qsStatus") String qsStatus); + List getOrgCodeList(Long userId); } diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/SysDeptEntity.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/SysDeptEntity.java index 30e357cb..9f318c0a 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/SysDeptEntity.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/SysDeptEntity.java @@ -1,29 +1,42 @@ package com.dxhy.sign.entity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.io.Serializable; import java.util.Date; +import java.util.List; /** + * 部门管理 + * * @author jiaohongyang - * @date 2019年3月26日 下午6:02:48 */ @Data @TableName("sys_dept") public class SysDeptEntity implements Serializable { + private static final long serialVersionUID = 1L; - private String password; - - private Long deptId; + /** + * 部门ID + */ + @TableId + private String deptId; /** * 上级部门ID，一级部门为0 */ - private Long parentId; + private String parentId; /** * 部门名称 */ private String name; + /** + * 上级部门名称 + */ + @TableField(exist = false) + private String parentName; private Integer orderNum; private String taxno; @@ -79,10 +92,18 @@ public class SysDeptEntity implements Serializable { * 是否需要确认密码 */ private String isPassword; + /** + * 确认密码 + */ + private String password; private Date updateTime; private Date createTime; + private String autoRz; + private String productType; + @TableField(exist = false) + private List children; } diff --git a/dxhy-sign/src/main/resources/mapper/SysDeptDao.xml b/dxhy-sign/src/main/resources/mapper/SysDeptDao.xml new file mode 100644 index 00000000..e532ed2b --- /dev/null +++ b/dxhy-sign/src/main/resources/mapper/SysDeptDao.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + update + sys_dept + set qs_status = #{qsStatus}, + db_name = #{dbName}, + ace_key = #{aceKey}, + ace_id = #{aceId}, + is_collext = #{isCollext} + where company = #{company} + and org_type != '1' + + + + + + + + + + + +