From 1f05a6ab6fbb2a8e6d702759ef9b52dbb6aeb148 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 04 六月 2025 16:46:25 +0800
Subject: [PATCH] 切换公司登录
---
src/main/java/com/ruoyi/project/system/mapper/SysUserDeptMapper.java | 2
src/main/resources/mapper/system/SysUserDeptMapper.xml | 7 ++-
src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 5 ++
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 23 +++++++++++
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 21 +++++++++-
src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java | 5 +-
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 11 +++++
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 15 +++++++
src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java | 1
src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java | 6 +++
src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 2
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 13 ++++--
src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java | 2
14 files changed, 97 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 0d12ac3..5252013 100644
--- a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@
.authorizeHttpRequests((requests) -> {
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- requests.antMatchers("/login", "/register", "/captchaImage","/loginCheck","/userDeptList/**","/loginCheckFactory").permitAll()
+ requests.antMatchers("/login", "/register", "/captchaImage","/loginCheck","/userLoginFacotryList/**","/loginCheckFactory").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 5925a68..15fb7e1 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -3,9 +3,12 @@
import java.util.List;
import java.util.Set;
+import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysUserDeptService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.utils.SecurityUtils;
@@ -42,6 +45,9 @@
@Autowired
private ISysUserDeptService userDeptService;
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+
/**
* 鐧诲綍鏂规硶
*
@@ -69,6 +75,15 @@
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
+ // 鑾峰彇褰撳墠鐧诲綍鍏徃
+ Integer tenantId = loginUser.getTenantId();
+ if(null != tenantId){
+ user.setTenantId(tenantId);
+ SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
+ if(!ObjectUtils.isEmpty(sysDept)){
+ user.setCurrentFactoryName(sysDept.getDeptName());
+ }
+ }
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -109,9 +124,9 @@
}
}
- @GetMapping("/userDeptList")
- public AjaxResult userDeptList(SysUserDeptVo sysUserDeptVo){
- return AjaxResult.success(userDeptService.selectUserDeptList(sysUserDeptVo));
+ @GetMapping("/userLoginFacotryList")
+ public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ return AjaxResult.success(userDeptService.userLoginFacotryList(sysUserDeptVo));
}
/**
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index d66dc5e..aa787ed 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -117,7 +117,7 @@
ajax.put("posts", postService.selectPostAll());
SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
sysUserDeptVo.setUserId(userId);
- List<SysUserDeptVo> sysUserDeptVos = userDeptService.selectUserDeptList(sysUserDeptVo);
+ List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);
ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
return ajax;
}
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index e89ad32..d461608 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -97,6 +97,17 @@
private Long currentDeptId;
+ /** 褰撳墠鐧诲綍鍏徃 */
+ private String currentFactoryName;
+
+ public String getCurrentFactoryName() {
+ return currentFactoryName;
+ }
+
+ public void setCurrentFactoryName(String currentFactoryName) {
+ this.currentFactoryName = currentFactoryName;
+ }
+
/**
* 閮ㄩ棬鍚嶇О
*/
diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserDeptMapper.java b/src/main/java/com/ruoyi/project/system/mapper/SysUserDeptMapper.java
index fbcab9a..d6bed98 100644
--- a/src/main/java/com/ruoyi/project/system/mapper/SysUserDeptMapper.java
+++ b/src/main/java/com/ruoyi/project/system/mapper/SysUserDeptMapper.java
@@ -11,5 +11,5 @@
@Mapper
public interface SysUserDeptMapper extends BaseMapper<SysUserDept> {
- List<SysUserDeptVo> selectUserDeptList(@Param("userDeptVo") SysUserDeptVo userDeptVo);
+ List<SysUserDeptVo> userLoginFacotryList(@Param("userDeptVo") SysUserDeptVo userDeptVo);
}
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java b/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java
index c21dbeb..47f6bbc 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysUserDeptService.java
@@ -6,5 +6,5 @@
public interface ISysUserDeptService {
- List<SysUserDeptVo> selectUserDeptList(SysUserDeptVo userDeptVo);
+ List<SysUserDeptVo> userLoginFacotryList(SysUserDeptVo userDeptVo);
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
index 5e5eed0..97be11b 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserDeptServiceImpl.java
@@ -6,7 +6,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
import java.util.List;
@Service
@@ -16,7 +15,7 @@
private SysUserDeptMapper sysUserDeptMapper;
@Override
- public List<SysUserDeptVo> selectUserDeptList(SysUserDeptVo userDeptVo) {
- return sysUserDeptMapper.selectUserDeptList(userDeptVo);
+ public List<SysUserDeptVo> userLoginFacotryList(SysUserDeptVo userDeptVo) {
+ return sysUserDeptMapper.userLoginFacotryList(userDeptVo);
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 3078365..50bf83b 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -1,7 +1,10 @@
package com.ruoyi.sales.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.ReceiptPaymentService;
@@ -13,7 +16,7 @@
@RestController
@RequestMapping("/receiptPayment")
-public class ReceiptPaymentController {
+public class ReceiptPaymentController extends BaseController {
@Autowired
private ReceiptPaymentService receiptPaymentService;
@@ -111,4 +114,14 @@
public AjaxResult getAmountMouth() {
return AjaxResult.success(receiptPaymentService.getAmountMouth());
}
+
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ @GetMapping("/receiptPaymentHistoryList")
+ public TableDataInfo receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto) {
+ startPage();
+ List<ReceiptPaymentDto> list = receiptPaymentService.receiptPaymentHistoryList(receiptPaymentDto);
+ return getDataTable(list);
+ }
}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
index 2914230..c876293 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.util.List;
public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {
@@ -39,4 +40,9 @@
*/
BigDecimal getReceiptAmount(@Param("customerId") Integer customerId, @Param("total") long total);
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ List<ReceiptPaymentDto> receiptPaymentHistoryList(@Param("params") ReceiptPaymentDto receiptPaymentDto);
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
index 755830e..1971d4a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -41,6 +41,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index dbb85ce..0413682 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -66,4 +66,9 @@
InvoiceLedgerDto invoiceInfo(Integer id);
Map<String,BigDecimal> getAmountMouth();
+
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ List<ReceiptPaymentDto> receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto);
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 16cc5e9..62add42 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -19,10 +19,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
@Service
public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService {
@@ -177,4 +174,12 @@
result.put("contractAmount", contractAmount);
return result;
}
+
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ @Override
+ public List<ReceiptPaymentDto> receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto) {
+ return receiptPaymentMapper.receiptPaymentHistoryList(receiptPaymentDto);
+ }
}
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index a20ea15..53cca98 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -142,4 +142,27 @@
LIMIT #{total} ) AS limited_rows
</select>
+ <select id="receiptPaymentHistoryList" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
+ SELECT
+ T1.receipt_payment_date,
+ T5.customer_name,
+ T1.receipt_payment_amount,
+ T1.receipt_payment_type,
+ T1.registrant,
+ T1.create_time
+ FROM
+ receipt_payment T1
+ LEFT JOIN
+ invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
+ LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
+ LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
+ LEFT JOIN customer T5 ON T5.id = T4.customer_id
+ <where>
+ <if test="params.searchText != null and params.searchText != '' ">
+ T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
+ </if>
+ </where>
+ ORDER BY T1.receipt_payment_date DESC
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/system/SysUserDeptMapper.xml b/src/main/resources/mapper/system/SysUserDeptMapper.xml
index 898d3d1..81c1365 100644
--- a/src/main/resources/mapper/system/SysUserDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysUserDeptMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
- <select id="selectUserDeptList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
+ <select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
SELECT
T1.user_id,
T1.dept_id,
@@ -13,11 +13,12 @@
sys_user_dept T1
LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
<where>
+ T1.dept_id IN (select dept_id from sys_dept where parent_id = 100)
<if test="userDeptVo.userId != null">
- T1.user_id = #{userDeptVo.userId}
+ AND T1.user_id = #{userDeptVo.userId}
</if>
<if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
- T1.user_id IN (
+ AND T1.user_id IN (
SELECT user_id FROM sys_user WHERE nick_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
)
</if>
--
Gitblit v1.9.3