From 5ea995912d4134f2027a3ddb566718f56d979261 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 三月 2026 16:49:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java | 1
src/main/resources/mapper/staff/StaffEmergencyContactMapper.xml | 19
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 6
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 79 +
src/main/java/com/ruoyi/staff/mapper/StaffEmergencyContactMapper.java | 18
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java | 48 +
src/main/resources/application-dev.yml | 4
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 71 +
src/main/java/com/ruoyi/staff/service/StaffWorkExperienceService.java | 16
src/main/java/com/ruoyi/aftersalesservice/dto/CountDto.java | 11
src/main/java/com/ruoyi/procurementrecord/service/ReturnManagementService.java | 14
src/main/java/com/ruoyi/staff/service/StaffEducationService.java | 16
src/main/java/com/ruoyi/staff/service/StaffEmergencyContactService.java | 16
src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml | 50
src/main/java/com/ruoyi/projectManagement/pojo/Plan.java | 84 +
src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java | 14
src/main/java/com/ruoyi/staff/service/impl/StaffEducationServiceImpl.java | 20
src/main/java/com/ruoyi/staff/service/impl/SchemeInsuranceDetailServiceImpl.java | 20
src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml | 21
src/main/java/com/ruoyi/projectManagement/pojo/Roles.java | 4
src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java | 25
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 93 +
src/main/java/com/ruoyi/staff/pojo/StaffEducation.java | 79 +
src/main/resources/mapper/projectManagement/PlanMapper.xml | 30
doc/20260306_craete_purchase_return_orders.sql | 33
src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java | 11
src/main/java/com/ruoyi/staff/service/SchemeInsuranceDetailService.java | 16
src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java | 20
src/main/java/com/ruoyi/projectManagement/mapper/PlanMapper.java | 21
src/main/resources/mapper/staff/StaffWorkExperienceMapper.xml | 21
pom.xml | 7
src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java | 19
src/main/java/com/ruoyi/projectManagement/vo/SearchPlanVo.java | 21
src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java | 81 +
src/main/java/com/ruoyi/common/vo/SimpleFileVo.java | 28
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 6
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml | 23
src/main/java/com/ruoyi/staff/mapper/SchemeInsuranceDetailMapper.java | 18
src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java | 48 +
src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java | 12
src/main/java/com/ruoyi/projectManagement/vo/PlanVo.java | 40
src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java | 23
src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java | 27
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 25
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java | 8
src/main/java/com/ruoyi/staff/controller/StaffEmergencyContactController.java | 18
src/main/java/com/ruoyi/staff/mapper/StaffWorkExperienceMapper.java | 18
src/main/java/com/ruoyi/staff/controller/SchemeInsuranceDetailController.java | 18
src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java | 84 +
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java | 57
src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java | 61
src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java | 3
src/main/resources/mapper/system/SysUserMapper.xml | 3
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 3
src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java | 2
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 5
src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java | 18
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 132 ++
src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java | 63 +
src/main/java/com/ruoyi/projectManagement/service/PlanService.java | 34
src/main/java/com/ruoyi/project/system/domain/SysDept.java | 5
src/main/java/com/ruoyi/staff/mapper/SchemeApplicableStaffMapper.java | 18
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java | 44
src/main/resources/mapper/staff/StaffEducationMapper.xml | 21
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 13
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 153 +++
src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java | 16
src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java | 5
src/main/java/com/ruoyi/projectManagement/vo/SavePlanVo.java | 31
src/main/java/com/ruoyi/basic/dto/CustomerFollowUpFileDto.java | 26
src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java | 21
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 11
src/main/java/com/ruoyi/staff/service/impl/StaffEmergencyContactServiceImpl.java | 20
src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java | 30
src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java | 8
src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java | 20
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java | 32
src/main/resources/mapper/staff/SchemeInsuranceDetailMapper.xml | 20
src/main/java/com/ruoyi/staff/service/impl/StaffWorkExperienceServiceImpl.java | 20
src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java | 9
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java | 14
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 1
src/main/java/com/ruoyi/procurementrecord/controller/ReturnSaleProductController.java | 18
src/main/java/com/ruoyi/aftersalesservice/service/AfterSalesServiceService.java | 8
src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java | 65 +
src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java | 79 +
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 18
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 22
src/main/java/com/ruoyi/staff/mapper/StaffEducationMapper.java | 18
src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml | 20
src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java | 69 +
src/main/java/com/ruoyi/staff/controller/StaffEducationController.java | 18
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 20
src/main/java/com/ruoyi/staff/controller/StaffWorkExperienceController.java | 18
src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java | 69 +
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 43
src/main/resources/mapper/system/SysDeptMapper.xml | 4
97 files changed, 2,698 insertions(+), 115 deletions(-)
diff --git a/doc/20260306_craete_purchase_return_orders.sql b/doc/20260306_craete_purchase_return_orders.sql
new file mode 100644
index 0000000..6e31d78
--- /dev/null
+++ b/doc/20260306_craete_purchase_return_orders.sql
@@ -0,0 +1,33 @@
+#浜у搧閫�璐у崟琛�
+drop table if exists purchase_return_orders;
+create table purchase_return_orders
+(
+ id bigint auto_increment primary key,
+ no varchar(255) null comment '閫�璐у崟缂栧彿',
+ return_type tinyint not null default 0 comment '閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹',
+ supplier_id bigint not null default 0 comment '渚涘簲鍟唅d',
+ project_id bigint not null default 0 comment '椤圭洰id',
+ project_phase tinyint not null default 0 comment '椤圭洰闃舵',
+ prepared_at datetime null comment '鍒跺崟鏃ユ湡',
+ prepared_user_id bigint not null default 0 comment '鍒跺崟浜篿d',
+ return_user_id bigint not null default 0 comment '閫�鏂欎汉id',
+ purchase_ledger_id bigint not null default 0 comment '閲囪喘璁㈠崟id',
+ remark text null comment '澶囨敞',
+ create_time datetime null comment '褰曞叆鏃堕棿',
+ update_time datetime null comment '鏇存柊鏃堕棿',
+ index idx_purchase_ledger_id (purchase_ledger_id),
+ index idx_project_id (project_id)
+);
+
+#浜у搧閫�璐у崟涓庨噰璐骇鍝佸叧鑱旇〃
+drop table if exists purchase_return_order_products;
+create table purchase_return_order_products
+(
+ id bigint auto_increment primary key,
+ purchase_return_order_id bigint not null default 0 comment '閫�璐у崟id',
+ sales_ledger_product_id bigint not null default 0 comment '閲囪喘浜у搧id',
+ create_time datetime null comment '褰曞叆鏃堕棿',
+ update_time datetime null comment '鏇存柊鏃堕棿',
+ index idx_purchase_return_order_id (purchase_return_order_id),
+ index idx_sales_ledger_product_id (sales_ledger_product_id)
+);
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1eadd23..c001bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,6 +323,13 @@
<version>${hutool.version}</version>
</dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.43</version>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index 15dcfac..95e9999 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -49,8 +49,8 @@
@GetMapping("/listPage")
@ApiOperation("鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
@Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, AfterSalesService afterSalesService) {
- IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
return AjaxResult.success(listPage);
}
@@ -59,8 +59,8 @@
@ApiOperation("鍞悗鏈嶅姟-鍙嶉鐧昏")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
- AfterSalesService afterSalesService = new AfterSalesService();
- IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
List<AfterSalesServiceExeclDto> list = new ArrayList<>();
listPage.getRecords().forEach(item -> {
AfterSalesServiceExeclDto dto = new AfterSalesServiceExeclDto();
@@ -77,12 +77,12 @@
@ApiOperation("鍞悗鏈嶅姟-鍞悗澶勭悊")
public void exportTwo(HttpServletResponse response) {
Page page = new Page(-1,-1);
- AfterSalesService afterSalesService = new AfterSalesService();
- IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
listPage.getRecords().forEach(item -> {
item.setStatusName(item.getStatus().toString());
});
- ExcelUtil<AfterSalesService> util = new ExcelUtil<AfterSalesService>(AfterSalesService.class);
+ ExcelUtil<AfterSalesServiceNewDto> util = new ExcelUtil<AfterSalesServiceNewDto>(AfterSalesServiceNewDto.class);
util.exportExcel(response, listPage.getRecords() , "鍞悗澶勭悊");
}
@@ -148,4 +148,10 @@
return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
}
+ @ApiOperation("鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
+ @GetMapping("count")
+ public AjaxResult count() {
+ return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
+ }
+
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
index 19320a2..9e35764 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
@@ -16,4 +16,6 @@
private List<Long> productModelIdList;
private SalesLedgerDto salesLedgerDto;
+
+ private String salesContractNo;
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/CountDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/CountDto.java
new file mode 100644
index 0000000..6ada2bc
--- /dev/null
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/CountDto.java
@@ -0,0 +1,11 @@
+package com.ruoyi.aftersalesservice.dto;
+
+import lombok.Data;
+
+@Data
+public class CountDto {
+
+ private Integer status ;
+
+ private Integer count ;
+}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java b/src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java
index 1c09a0e..1f439fc 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/mapper/AfterSalesServiceMapper.java
@@ -3,8 +3,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
+import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
/**
* @author :yys
@@ -18,5 +23,7 @@
* @param afterSalesService
* @return
*/
- IPage<AfterSalesService> listPage(Page page,@Param("req") AfterSalesService afterSalesService);
+ IPage<AfterSalesServiceNewDto> listPage(Page page, @Param("req") AfterSalesServiceNewDto afterSalesService);
+
+ List<CountDto> countAfterSalesService();
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
index 3d4bb51..e11722e 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -33,8 +33,12 @@
@ApiModelProperty("鐘舵�� 1-寰呭鐞� 2-宸插鐞�")
private Integer status;
+ @ApiModelProperty("鍞悗鍗曞彿")
+ private String afterSalesServiceNo;
+
@Excel(name = "鐘舵��", readConverterExp = "1=寰呭鐞�,2=宸插鐞�")
+ @TableField(exist = false)
private String statusName;
/**
@@ -138,20 +142,20 @@
private String deptName;
- @TableField("鍞悗绫诲瀷")
+ @ApiModelProperty("鍞悗绫诲瀷")
private String serviceType;
- @TableField("绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴�")
private String urgency;
- @TableField("閿�鍞彴璐D")
+ @ApiModelProperty("閿�鍞彴璐D")
private Long salesLedgerId;
- @TableField("鍒嗛厤浜篒D")
+ @ApiModelProperty("鍒嗛厤浜篒D")
private Long distributionUserId;
- @TableField("浜у搧鍨嬪彿IDs")
+ @ApiModelProperty("浜у搧鍨嬪彿IDs")
private String productModelIds;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/service/AfterSalesServiceService.java b/src/main/java/com/ruoyi/aftersalesservice/service/AfterSalesServiceService.java
index 21b4e75..f67b757 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/service/AfterSalesServiceService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/service/AfterSalesServiceService.java
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
+import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
+
+import java.util.List;
/**
* @author :yys
@@ -19,9 +22,12 @@
* @param afterSalesService
* @return
*/
- IPage<AfterSalesService> listPage(Page page, AfterSalesService afterSalesService);
+ IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService);
boolean addAfterSalesServiceDto(AfterSalesServiceNewDto afterSalesServiceNewDto);
AfterSalesServiceNewDto getAfterSalesServiceNewDtoById(Long id);
+
+ List<CountDto> countAfterSalesService();
+
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
index 5f399ca..68dfa7f 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/service/impl/AfterSalesServiceServiceImpl.java
@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
+import com.ruoyi.aftersalesservice.dto.CountDto;
import com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.aftersalesservice.service.AfterSalesServiceService;
+import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.system.domain.SysDept;
@@ -19,8 +21,6 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
-import com.ruoyi.sales.service.impl.SalesLedgerProductServiceImpl;
-import com.ruoyi.sales.service.impl.SalesLedgerServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,10 +52,10 @@
private ISalesLedgerService salesLedgerService;
@Override
- public IPage<AfterSalesService> listPage(Page page, AfterSalesService afterSalesService) {
+ public IPage<AfterSalesServiceNewDto> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
- IPage<AfterSalesService> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
+ IPage<AfterSalesServiceNewDto> afterSalesServiceIPage = afterSalesServiceMapper.listPage(page, afterSalesService);
afterSalesServiceIPage.getRecords().forEach(item -> {
item.setDeptName(sysDept.getDeptName());
});
@@ -74,6 +74,10 @@
SysUser sysUser = sysUserMapper.selectUserById(afterSalesServiceNewDto.getCheckUserId());
if(sysUser == null) throw new RuntimeException("瀹℃牳浜轰笉瀛樺湪");
afterSalesServiceNewDto.setCheckNickName(sysUser.getNickName());
+ if (StringUtils.isEmpty(afterSalesServiceNewDto.getAfterSalesServiceNo())) {
+ String string = OrderUtils.countAfterServiceTodayByCreateTime(afterSalesServiceMapper, "SH_");
+ afterSalesServiceNewDto.setAfterSalesServiceNo(string);
+ }
return this.save(afterSalesServiceNewDto);
}
@@ -82,7 +86,7 @@
AfterSalesService afterSalesService = afterSalesServiceMapper.selectById(id);
SalesLedger byId = salesLedgerService.getById(afterSalesService.getSalesLedgerId());
List<Long> collect = Arrays.stream(afterSalesService.getProductModelIds().split(",")).map(Long::valueOf).collect(Collectors.toList());
- List<SalesLedgerProduct> list = salesLedgerProductService.list(new QueryWrapper<SalesLedgerProduct>().lambda().in(SalesLedgerProduct::getProductModelId, collect));
+ List<SalesLedgerProduct> list = salesLedgerProductService.list(new QueryWrapper<SalesLedgerProduct>().lambda().in(SalesLedgerProduct::getId, collect));
AfterSalesServiceNewDto afterSalesServiceNewDto = new AfterSalesServiceNewDto();
BeanUtils.copyProperties(afterSalesService, afterSalesServiceNewDto);
SalesLedgerDto salesLedgerDto = new SalesLedgerDto();
@@ -91,4 +95,20 @@
afterSalesServiceNewDto.setSalesLedgerDto(salesLedgerDto);
return afterSalesServiceNewDto;
}
+
+ @Override
+ public List<CountDto> countAfterSalesService() {
+ List<CountDto> stringIntegerHashMap = afterSalesServiceMapper.countAfterSalesService();
+ Integer total = 0;
+ for (CountDto countDto : stringIntegerHashMap) {
+ total += countDto.getCount();
+ }
+ CountDto countDto = new CountDto();
+ countDto.setStatus(3);
+ countDto.setCount(total);
+ stringIntegerHashMap.add(countDto);
+
+ return stringIntegerHashMap;
+
+ }
}
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
index d863c8a..2b70438 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -15,6 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
+import com.ruoyi.common.utils.SecurityUtils;
import java.util.List;
@@ -86,8 +88,27 @@
@PostMapping("/upload/{followUpId}")
@Log(title = "瀹㈡埛璺熻繘-涓婁紶闄勪欢", businessType = BusinessType.INSERT)
public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
- customerFollowUpService.addFollowUpFiles(files, followUpId);
- return AjaxResult.success();
+ return AjaxResult.success(customerFollowUpService.addFollowUpFiles(files, followUpId));
+ }
+
+ /**
+ * 涓婁紶璺熻繘闄勪欢锛堝鐢紝鏃營D锛�
+ */
+ @ApiOperation("涓婁紶闄勪欢(澶嶇敤)")
+ @PostMapping("/upload")
+ @Log(title = "涓婁紶闄勪欢(澶嶇敤)", businessType = BusinessType.INSERT)
+ public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
+ List<CustomerFollowUpFileDto> uploadedFiles = customerFollowUpService.addFollowUpFiles(files, null);
+ return AjaxResult.success(uploadedFiles);
+ }
+
+ /**
+ * 鎵归噺鏌ヨ闄勪欢鍒楄〃
+ */
+ @ApiOperation("鎵归噺鏌ヨ闄勪欢鍒楄〃")
+ @PostMapping("/file/list")
+ public AjaxResult getFileList(@RequestBody List<Long> ids) {
+ return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
}
/**
diff --git a/src/main/java/com/ruoyi/basic/dto/CustomerFollowUpFileDto.java b/src/main/java/com/ruoyi/basic/dto/CustomerFollowUpFileDto.java
new file mode 100644
index 0000000..1440428
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/dto/CustomerFollowUpFileDto.java
@@ -0,0 +1,26 @@
+package com.ruoyi.basic.dto;
+
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 瀹㈡埛璺熻繘闄勪欢DTO
+ *
+ * @author deslrey
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CustomerFollowUpFileDto extends CustomerFollowUpFile {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婁紶鑰呭鍚�
+ */
+ private String createUserName;
+
+ /**
+ * 淇敼鑰呭鍚�
+ */
+ private String updateUserName;
+}
diff --git a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
index e35054e..66e5e2c 100644
--- a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
+++ b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
@@ -2,6 +2,13 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+import com.ruoyi.common.vo.SimpleFileVo;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
/**
* <br>
@@ -13,4 +20,18 @@
* @since 2026/03/04 14:52
*/
public interface CustomerFollowUpFileService extends IService<CustomerFollowUpFile> {
+
+ /**
+ * 鏍规嵁 xx,xxx,xx鎵归噺鏌ヨ骞朵笖鍑烘彃鍏impleFileVo杩涘叆
+ * @param list
+ * @param getAttachmentIds
+ * @param setAttachmentList
+ * @param <T>
+ */
+ <T> void fillAttachment(
+ @Null List<T> list,
+ @NotNull Function<T, String> getAttachmentIds,
+ @NotNull BiConsumer<T, List<SimpleFileVo>> setAttachmentList
+ );
+
}
diff --git a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java
index 25b5809..24992f7 100644
--- a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java
+++ b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.pojo.CustomerFollowUp;
-import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import org.springframework.web.multipart.MultipartFile;
+import java.util.Collection;
import java.util.List;
/**
@@ -41,7 +43,7 @@
/**
* 娣诲姞璺熻繘闄勪欢
*/
- void addFollowUpFiles(List<MultipartFile> files, Integer followUpId);
+ List<CustomerFollowUpFileDto> addFollowUpFiles(List<MultipartFile> files, Integer followUpId);
/**
* 鍒犻櫎璺熻繘闄勪欢
@@ -49,6 +51,11 @@
void deleteFollowUpFile(Integer fileId);
/**
+ * 鏍规嵁闄勪欢ID闆嗗悎鑾峰彇闄勪欢鍒楄〃
+ */
+ List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds);
+
+ /**
* 鑾峰彇璺熻繘璇︽儏
*/
CustomerFollowUpDto getFollowUpWithFiles(Integer id);
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
index 48cbddb..e5f992f 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpFileServiceImpl.java
@@ -1,10 +1,21 @@
package com.ruoyi.basic.service.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.stream.CollectorUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.CustomerFollowUpFileMapper;
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
+import com.ruoyi.basic.service.CustomerFollowUpService;
+import com.ruoyi.common.vo.SimpleFileVo;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* <br>
@@ -16,5 +27,42 @@
* @since 2026/03/04 14:53
*/
@Service
+@RequiredArgsConstructor
public class CustomerFollowUpFileServiceImpl extends ServiceImpl<CustomerFollowUpFileMapper, CustomerFollowUpFile> implements CustomerFollowUpFileService {
+
+ private final CustomerFollowUpService customerFollowUpService;
+
+
+ @Override
+ public <T> void fillAttachment(List<T> list, Function<T, String> getAttachmentIds, BiConsumer<T, List<SimpleFileVo>> setAttachmentList) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ // 鏀堕泦鎵�鏈夋枃浠禝D
+ Set<Long> ids = list.stream()
+ .map(getAttachmentIds)
+ .filter(StrUtil::isNotBlank)
+ .flatMap(s -> Arrays.stream(s.split(",")))
+ .map(Long::valueOf)
+ .collect(Collectors.toSet());
+
+ List<CustomerFollowUpFile> followUpFilesByIds = customerFollowUpService.getFollowUpFilesByIds(ids);
+ if (CollUtil.isEmpty(followUpFilesByIds)) {
+ return;
+ }
+ Map<Long, SimpleFileVo> collectMap = followUpFilesByIds.stream().map(SimpleFileVo::convert).collect(Collectors.toMap(
+ SimpleFileVo::getId,
+ Function.identity()
+ ));
+ list.forEach(t -> {
+ String attachmentIds = getAttachmentIds.apply(t);
+ if (StrUtil.isNotBlank(attachmentIds)) {
+ List<SimpleFileVo> fileVos = Arrays.stream(attachmentIds.split(","))
+ .map(Long::valueOf)
+ .map(it->collectMap.getOrDefault(it, (SimpleFileVo) Collections.emptyList()))
+ .collect(Collectors.toList());
+ setAttachmentList.accept(t, fileVos);
+ }
+ });
+ }
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
index 9f452ac..5637307 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerFollowUpServiceImpl.java
@@ -8,10 +8,12 @@
import com.ruoyi.basic.pojo.CustomerFollowUpFile;
import com.ruoyi.basic.service.CustomerFollowUpFileService;
import com.ruoyi.basic.service.CustomerFollowUpService;
-import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.basic.dto.CustomerFollowUpFileDto;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
@@ -28,7 +30,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.util.UUID;
@@ -49,6 +51,9 @@
@Value("${file.upload-dir}")
private String uploadDir;
+
+ @Autowired
+ private ISysUserService sysUserService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -78,8 +83,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void addFollowUpFiles(List<MultipartFile> files, Integer followUpId) {
- handleFollowUpFiles(files, followUpId);
+ public List<CustomerFollowUpFileDto> addFollowUpFiles(List<MultipartFile> files, Integer followUpId) {
+ return handleFollowUpFiles(files, followUpId);
}
@Override
@@ -136,14 +141,27 @@
}
}
- private void handleFollowUpFiles(List<MultipartFile> multipartFiles, Integer followUpId) {
+ @Override
+ public List<CustomerFollowUpFile> getFollowUpFilesByIds(Collection<Long> fileIds) {
+ if (fileIds == null || fileIds.isEmpty()) {
+ return new ArrayList<>(0);
+ }
+
+ LambdaQueryWrapper<CustomerFollowUpFile> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(CustomerFollowUpFile::getId, fileIds)
+ .select(CustomerFollowUpFile::getId, CustomerFollowUpFile::getFileUrl, CustomerFollowUpFile::getFileName);
+ return customerFollowUpFileService.list(queryWrapper);
+ }
+
+ private List<CustomerFollowUpFileDto> handleFollowUpFiles(List<MultipartFile> multipartFiles, Integer followUpId) {
+ List<CustomerFollowUpFile> fileList = new ArrayList<>();
+ List<CustomerFollowUpFileDto> dtoList = new ArrayList<>();
if (multipartFiles == null || multipartFiles.isEmpty()) {
- return;
+ return dtoList;
}
Long currentUserId = SecurityUtils.getUserId();
Long currentTenantId = SecurityUtils.getLoginUser().getTenantId();
- List<CustomerFollowUpFile> fileList = new ArrayList<>();
for (MultipartFile file : multipartFiles) {
if (file == null || file.isEmpty()) {
@@ -159,7 +177,8 @@
String originalFilename = file.getOriginalFilename();
String fileExtension = FilenameUtils.getExtension(originalFilename);
- String formalFilename = followUpId + "_" +
+ String prefix = (followUpId != null) ? followUpId.toString() : "temp";
+ String formalFilename = prefix + "_" +
System.currentTimeMillis() + "_" +
UUID.randomUUID().toString().substring(0, 8) +
(StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
@@ -184,7 +203,35 @@
}
if (!fileList.isEmpty()) {
customerFollowUpFileService.saveBatch(fileList);
+ return convertToDtoList(fileList);
}
+ return dtoList;
+ }
+
+ private List<CustomerFollowUpFileDto> convertToDtoList(List<CustomerFollowUpFile> fileList) {
+ List<CustomerFollowUpFileDto> dtoList = new ArrayList<>();
+ if (fileList == null || fileList.isEmpty()) {
+ return dtoList;
+ }
+ for (CustomerFollowUpFile entity : fileList) {
+ CustomerFollowUpFileDto dto = new CustomerFollowUpFileDto();
+ BeanUtils.copyProperties(entity, dto);
+
+ if (entity.getCreateUser() != null) {
+ SysUser createUser = sysUserService.selectUserById(entity.getCreateUser());
+ if (createUser != null) {
+ dto.setCreateUserName(createUser.getNickName());
+ }
+ }
+ if (entity.getUpdateUser() != null) {
+ SysUser updateUser = sysUserService.selectUserById(entity.getUpdateUser());
+ if (updateUser != null) {
+ dto.setUpdateUserName(updateUser.getNickName());
+ }
+ }
+ dtoList.add(dto);
+ }
+ return dtoList;
}
private void validateFollowUp(CustomerFollowUp followUp) {
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 52df76b..7bb9aba 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -13,6 +13,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -20,6 +21,50 @@
* @date : 2025/9/15 15:31
*/
public class OrderUtils {
+
+ /**
+ * List<Integer> 杞崲涓� Long[] 鏁扮粍
+ * @param ids
+ * @return
+ */
+ public static Long[] listIntegerToLongArray(List<Integer> ids) {
+ return ids.stream()
+ // 澶勭悊null鍊硷細濡傛灉鍏冪礌涓簄ull锛岃浆鎹负0L锛堝彲鏍规嵁涓氬姟璋冩暣锛屾瘮濡傛姏寮傚父锛�
+ .map(id -> id != null ? id.longValue() : -1L)
+ // 灏哠tream<Long>杞崲涓篖ong[]鏁扮粍
+ .toArray(Long[]::new);
+ }
+
+ /**
+ * 鍒ゆ柇鐩爣id鏄惁鍦ㄩ�楀彿鍒嗛殧鐨勫瓧绗︿覆涓�
+ * @param targetId
+ * @param str
+ * @return
+ */
+ public boolean isStaffIdExist(Object targetId,String str) {
+ // 绌哄�兼牎楠岋紝閬垮厤绌烘寚閽�
+ if (str == null || str.trim().isEmpty() || targetId == null) {
+ return false;
+ }
+ // 鎸夐�楀彿鍒嗗壊鎴愭暟缁�
+ String[] idArray = str.split(",");
+ // 閬嶅巻鏁扮粍鍒ゆ柇鏄惁鍖呭惈鐩爣id
+ for (String id : idArray) {
+ // 鍘婚櫎绌烘牸锛堥槻姝㈠瓧绗︿覆涓湁澶氫綑绌烘牸锛屽"1, 121"锛�
+ String cleanId = id.trim();
+ // 杞崲涓烘暟瀛楀苟姣旇緝
+ try {
+ if (cleanId.equals(String.valueOf(targetId))) {
+ return true;
+ }
+ } catch (NumberFormatException e) {
+ // 鑻ュ瓨鍦ㄩ潪鏁板瓧ID锛岀洿鎺ヨ繑鍥瀎alse
+ return false;
+ }
+ }
+ return false;
+ }
+
/**
@@ -54,4 +99,38 @@
// 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1)) + "-" + new Date().getTime();
}
+
+
+ /**
+ * 鏌ヨ褰撳ぉ锛堝熀浜巆reateTime瀛楁锛夌殑璁板綍鏁伴噺
+ * @param mapper 瀹炰綋绫诲搴旂殑BaseMapper
+ * @param <T> 瀹炰綋绫绘硾鍨�
+ * @return 褰撳ぉ璁板綍鏁伴噺
+ */
+ public static <T> String countAfterServiceTodayByCreateTime(BaseMapper<T> mapper,String preFix) {
+ // 鑾峰彇褰撳ぉ寮�濮嬫椂闂达紙00:00:00锛�
+ LocalDateTime todayStart = LocalDateTime.of(
+ LocalDateTime.now().toLocalDate(),
+ LocalTime.MIN
+ );
+ // 鑾峰彇褰撳ぉ缁撴潫鏃堕棿锛�23:59:59.999锛�
+ LocalDateTime todayEnd = LocalDateTime.of(
+ LocalDateTime.now().toLocalDate(),
+ LocalTime.MAX
+ );
+
+ // 杞崲涓篋ate绫诲瀷锛堝鏋滃疄浣撶被涓璫reateTime鏄疞ocalDateTime鍙洿鎺ヤ娇鐢級
+ Date startDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
+ Date endDate = Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant());
+
+ // 鏋勫缓鏌ヨ鏉′欢
+ QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+ queryWrapper.ge("create_time", startDate) // 澶т簬绛変簬褰撳ぉ寮�濮�
+ .lt("create_time", endDate); // 灏忎簬褰撳ぉ缁撴潫锛堥伩鍏嶆绉掔簿搴﹂棶棰橈級
+
+ // 鎵ц鏌ヨ
+ Long aLong = mapper.selectCount(queryWrapper);
+ // 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
+ return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));
+ }
}
diff --git a/src/main/java/com/ruoyi/common/vo/SimpleFileVo.java b/src/main/java/com/ruoyi/common/vo/SimpleFileVo.java
new file mode 100644
index 0000000..ea817c7
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/vo/SimpleFileVo.java
@@ -0,0 +1,28 @@
+package com.ruoyi.common.vo;
+
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author buhuazhen
+ * @date 2026/3/6
+ * @email 3038525872@qq.com
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SimpleFileVo implements Serializable {
+ private Long id;
+ private String fileName;
+ private String fileUrl;
+
+ public static SimpleFileVo convert(@NotNull CustomerFollowUpFile file){
+ return new SimpleFileVo(file.getId(), file.getFileName(), file.getFileUrl());
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index ab8b3d6..8874722 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -39,6 +39,7 @@
private Date updateTime;
/** 澶囨敞 */
+ @TableField(exist = false)
private String remark;
/** 璇锋眰鍙傛暟 */
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
index 3cb1e59..ebafe40 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
@@ -1,14 +1,20 @@
package com.ruoyi.procurementrecord.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.service.ReturnManagementService;
+import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
+import com.ruoyi.procurementrecord.service.impl.ReturnSaleProductServiceImpl;
+import com.ruoyi.sales.dto.SalesLedgerDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,48 +28,69 @@
* @date : 2025/9/17 10:34
*/
@RestController
-@Api(tags = "鍒拌揣绠＄悊")
+@Api(tags = "閿�鍞��璐�")
@RequestMapping("/returnManagement")
public class ReturnManagementController extends BaseController {
@Autowired
private ReturnManagementService returnManagementService;
-
@Autowired
- private ReturnManagementMapper returnManagementMapper;
+ private ReturnSaleProductService returnSaleProductService;
@GetMapping("/listPage")
- @ApiOperation("鍒拌揣绠＄悊-鏌ヨ")
- public AjaxResult listPage(Page page, ReturnManagement returnManagement) {
- IPage<ReturnManagement> result = returnManagementService.listPage(page, returnManagement);
+ @ApiOperation("閿�鍞��璐�-鏌ヨ")
+ public AjaxResult listPage(Page page, ReturnManagementDto returnManagement) {
+ IPage<ReturnManagementDto> result = returnManagementService.listPage(page, returnManagement);
return AjaxResult.success(result);
}
@PostMapping("/add")
- @ApiOperation("鍒拌揣绠＄悊-娣诲姞")
+ @ApiOperation("閿�鍞��璐�-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody ReturnManagement returnManagement) {
- String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT");
- returnManagement.setReturnNo(rt);
- boolean result = returnManagementService.save(returnManagement);
- return result ? success() : error();
+ public AjaxResult add(@RequestBody ReturnManagementDto returnManagementDto) {
+ return returnManagementService.addReturnManagementDto(returnManagementDto) ? success() : error();
}
@PostMapping("/update")
- @ApiOperation("鍒拌揣绠＄悊-淇敼")
+ @ApiOperation("閿�鍞��璐�-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody ReturnManagement returnManagement) {
- boolean result = returnManagementService.updateById(returnManagement);
- return result ? success() : error();
+ public AjaxResult update(@RequestBody ReturnManagementDto returnManagementDto) {
+ return returnManagementService.updateReturnManagementDto(returnManagementDto) ? success() : error();
}
+
+ @ApiOperation("閿�鍞��璐�-澶勭悊閫�璐у崟")
+ @GetMapping("/handle")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult handle(Long returnManagementId) {
+ return returnManagementService.handle(returnManagementId) ? success() : error();
+ }
+
+
@DeleteMapping("/del")
- @ApiOperation("鍒拌揣绠＄悊-鍒犻櫎")
+ @ApiOperation("閿�鍞��璐�-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
public AjaxResult del(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ returnSaleProductService.remove(new QueryWrapper<ReturnSaleProduct>()
+ .lambda()
+ .in(ReturnSaleProduct::getReturnManagementId, ids));
boolean result = returnManagementService.removeByIds(ids);
return result ? success() : error();
}
+ @GetMapping("/getById")
+ @ApiOperation("閿�鍞��璐�-鏍规嵁id鏌ヨ")
+ public AjaxResult getById(Long returnManagementId) {
+ ReturnManagementDto returnManagementDto = returnManagementService.getReturnManagementDtoById(returnManagementId);
+ return success(returnManagementDto);
+ }
+
+ @GetMapping("/getByShippingId")
+ @ApiOperation("閿�鍞��璐�-鏍规嵁鍑哄簱鍗曟煡璇㈤攢鍞鍗曚互鍙婁骇鍝佷俊鎭�")
+ public AjaxResult getByShippingId(Long shippingId) {
+ SalesLedgerDto salesLedgerDto = returnManagementService.getReturnManagementDtoByShippingIdId(shippingId);
+ return success(salesLedgerDto);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnSaleProductController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnSaleProductController.java
new file mode 100644
index 0000000..e7826aa
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnSaleProductController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.procurementrecord.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 閫�璐т骇鍝佽〃 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 03:57:42
+ */
+@RestController
+@RequestMapping("/returnSaleProduct")
+public class ReturnSaleProductController {
+
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
new file mode 100644
index 0000000..74b90c9
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
@@ -0,0 +1,48 @@
+package com.ruoyi.procurementrecord.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.procurementrecord.pojo.ReturnManagement;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author :yys
+ * @date : 2025/9/17 10:28
+ */
+@Data
+public class ReturnManagementDto extends ReturnManagement {
+
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ @ApiModelProperty(value = "閿�鍞崟鍙�")
+ private String salesContractNo;
+
+ @ApiModelProperty(value = "涓氬姟鍛�")
+ private String salesman;
+
+
+ @ApiModelProperty("鍏宠仈鍑哄簱鍗曞彿")
+ private String shippingNo;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String projectName;
+
+ @ApiModelProperty(value = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @ApiModelProperty(value = "閿�鍞骇鍝佸璞℃暟缁�")
+ private List<ReturnSaleProductDto> returnSaleProducts;
+
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
new file mode 100644
index 0000000..3cdb7dc
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.procurementrecord.dto;
+
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ReturnSaleProductDto extends ReturnSaleProduct {
+
+ private String productName;
+
+ private String model;
+
+ private String unit;
+
+ //鏈��璐ф暟閲�
+ private BigDecimal unReturn;
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
index 14953ad..4392109 100644
--- a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import org.apache.ibatis.annotations.Param;
@@ -18,5 +19,7 @@
* @param page
* @return
*/
- IPage<ReturnManagement> listPage(Page page,@Param("req") ReturnManagement returnManagement);
+ IPage<ReturnManagementDto> listPage(Page page, @Param("req") ReturnManagementDto returnManagement);
+
+ ReturnManagementDto getReturnManagementDtoById(Long id);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java
new file mode 100644
index 0000000..776a3b2
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ReturnSaleProductMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.procurementrecord.mapper;
+
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 閫�璐т骇鍝佽〃 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 03:57:42
+ */
+@Mapper
+public interface ReturnSaleProductMapper extends BaseMapper<ReturnSaleProduct> {
+
+ List<ReturnSaleProductDto> listReturnSaleProductDto(@Param("returnManagementId") Long returnManagementId);
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
index 54091ab..f061625 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
@@ -29,44 +29,39 @@
@ApiModelProperty(value = "閫�璐у崟鍙�")
private String returnNo;
- @ApiModelProperty(value = "鍏宠仈鍗曞彿")
- private String relatedNo;
+ @ApiModelProperty("瀹㈡埛id")
+ private Long customerId;
- @ApiModelProperty(value = "閫�璐х被鍨�")
- private String returnType;
+ @ApiModelProperty("鍏宠仈鍑哄簱鍗曞彿Id")
+ private Long shippingId;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
- private String supplierName;
+ @ApiModelProperty("椤圭洰id")
+ private Long projectId;
- @ApiModelProperty(value = "閫�璐у師鍥�")
- private String returnReason;
+ @ApiModelProperty("椤圭洰闃舵")
+ private String projectStage;
- @ApiModelProperty(value = "閫�璐х姸鎬�")
- private String status;
+ @ApiModelProperty("鍒跺崟浜�")
+ private String maker;
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鍒跺崟鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime makeTime;
+
+ @ApiModelProperty("缁撶畻浜�")
+ private String settler;
+
+ @ApiModelProperty("鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
-
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @ApiModelProperty(value = "淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
new file mode 100644
index 0000000..41ab99c
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
@@ -0,0 +1,44 @@
+package com.ruoyi.procurementrecord.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 閫�璐т骇鍝佽〃
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 03:57:42
+ */
+@Getter
+@Setter
+@TableName("return_sale_product")
+@ApiModel(value = "ReturnSaleProduct瀵硅薄", description = "閫�璐т骇鍝佽〃")
+public class ReturnSaleProduct implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("閫�璐у崟id")
+ private Long returnManagementId;
+
+ @ApiModelProperty("閫�璐т骇鍝乮d")
+ private Long returnSaleLedgerProductId;
+
+ @ApiModelProperty("閫�璐т骇鍝佹暟閲�")
+ private BigDecimal num;
+
+ @ApiModelProperty("閫�璐х姸鎬� 0 鏈��鍥� 1宸查��璐�")
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ReturnManagementService.java b/src/main/java/com/ruoyi/procurementrecord/service/ReturnManagementService.java
index b35be31..1a2de96 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/ReturnManagementService.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ReturnManagementService.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
+import com.ruoyi.sales.dto.SalesLedgerDto;
/**
* @author :yys
@@ -18,5 +20,15 @@
* @param returnManagement
* @return
*/
- IPage<ReturnManagement> listPage(Page page, ReturnManagement returnManagement);
+ IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement);
+
+ boolean addReturnManagementDto(ReturnManagementDto returnManagementDto);
+
+ boolean updateReturnManagementDto(ReturnManagementDto returnManagementDto);
+
+ SalesLedgerDto getReturnManagementDtoByShippingIdId(Long shippingId);
+
+ boolean handle(Long returnManagementId);
+
+ ReturnManagementDto getReturnManagementDtoById(Long returnManagementId);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java b/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java
new file mode 100644
index 0000000..64e6e16
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ReturnSaleProductService.java
@@ -0,0 +1,20 @@
+package com.ruoyi.procurementrecord.service;
+
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 閫�璐т骇鍝佽〃 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 03:57:42
+ */
+public interface ReturnSaleProductService extends IService<ReturnSaleProduct> {
+
+ List<ReturnSaleProductDto> listReturnSaleProductDto(Long returnManagementId);
+}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index ef3f242..080150b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -1,14 +1,38 @@
package com.ruoyi.procurementrecord.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.procurementrecord.dto.ReturnManagementDto;
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;
+import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
import com.ruoyi.procurementrecord.pojo.ReturnManagement;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import com.ruoyi.procurementrecord.service.ReturnManagementService;
+import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
+import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
+import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.sales.service.impl.ShippingInfoServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -21,9 +45,74 @@
@Autowired
private ReturnManagementMapper returnManagementMapper;
+ @Autowired
+ private ReturnSaleProductService returnSaleProductService;
+ @Autowired
+ private ShippingInfoService shippingInfoService;
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+
@Override
- public IPage<ReturnManagement> listPage(Page page, ReturnManagement returnManagement) {
- IPage<ReturnManagement> returnManagementIPage = returnManagementMapper.listPage(page, returnManagement);
+ public IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement) {
+ IPage<ReturnManagementDto> returnManagementIPage = returnManagementMapper.listPage(page, returnManagement);
+ for (ReturnManagementDto returnManagementDto : returnManagementIPage.getRecords()) {
+ List<ReturnSaleProductDto> returnSaleProducts = returnSaleProductService.listReturnSaleProductDto(returnManagementDto.getId());
+ returnManagementDto.setReturnSaleProducts(returnSaleProducts);
+ }
return returnManagementIPage;
}
+
+ @Override
+ public boolean addReturnManagementDto(ReturnManagementDto returnManagementDto) {
+ String rt = OrderUtils.countTodayByCreateTime(returnManagementMapper, "RT");
+ returnManagementDto.setReturnNo(rt);
+ save(returnManagementDto);
+ for (ReturnSaleProduct returnSaleProduct : returnManagementDto.getReturnSaleProducts()) {
+ returnSaleProduct.setReturnManagementId(returnManagementDto.getId());
+ returnSaleProduct.setStatus(0);
+ returnSaleProductService.save(returnSaleProduct);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean updateReturnManagementDto(ReturnManagementDto returnManagementDto) {
+ List<ReturnSaleProduct> returnSaleProducts = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(returnManagementDto.getReturnSaleProducts())) {
+ returnManagementDto.getReturnSaleProducts().stream().forEach(returnSaleProductDto -> {
+ ReturnSaleProduct returnSaleProduct = new ReturnSaleProduct();
+ BeanUtils.copyProperties(returnSaleProductDto, returnSaleProduct);
+ returnSaleProducts.add(returnSaleProduct);
+ });
+ }
+ returnSaleProductService.updateBatchById(returnSaleProducts);
+ return updateById(returnManagementDto);
+ }
+
+ @Override
+ public SalesLedgerDto getReturnManagementDtoByShippingIdId(Long shippingId) {
+ ShippingInfo byId = shippingInfoService.getById(shippingId);
+ SalesLedger salesLedger = salesLedgerMapper.selectById(byId.getSalesLedgerId());
+ SalesLedgerDto salesLedgerDto = new SalesLedgerDto();
+ BeanUtils.copyProperties(salesLedger, salesLedgerDto);
+
+ List<SalesLedgerProductDto> salesLedgerProductDtos = shippingInfoService.getReturnManagementDtoById(shippingId);
+ salesLedgerDto.setProductDtoData(salesLedgerProductDtos);
+ return salesLedgerDto;
+ }
+
+ @Override
+ public boolean handle(Long returnManagementId) {
+ ReturnManagement byId = this.getById(returnManagementId);
+ byId.setStatus(1);
+ return false;
+ }
+
+ @Override
+ public ReturnManagementDto getReturnManagementDtoById(Long returnManagementId) {
+ ReturnManagementDto returnManagementDtoById = returnManagementMapper.getReturnManagementDtoById(returnManagementId);
+ returnManagementDtoById.setReturnSaleProducts(returnSaleProductService.listReturnSaleProductDto(returnManagementId));
+ return returnManagementDtoById;
+ }
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
new file mode 100644
index 0000000..2e43729
--- /dev/null
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnSaleProductServiceImpl.java
@@ -0,0 +1,32 @@
+package com.ruoyi.procurementrecord.service.impl;
+
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
+import com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper;
+import com.ruoyi.procurementrecord.service.ReturnSaleProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ * 閫�璐т骇鍝佽〃 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 03:57:42
+ */
+@Service
+public class ReturnSaleProductServiceImpl extends ServiceImpl<ReturnSaleProductMapper, ReturnSaleProduct> implements ReturnSaleProductService {
+
+ @Autowired
+ private ReturnSaleProductMapper returnSaleProductMapper;
+ @Override
+ public List<ReturnSaleProductDto> listReturnSaleProductDto(Long returnManagementId) {
+
+ return returnSaleProductMapper.listReturnSaleProductDto(returnManagementId);
+ }
+}
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/src/main/java/com/ruoyi/project/system/domain/SysDept.java
index 54e53a7..355618d 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysDept.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysDept.java
@@ -6,6 +6,8 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -50,15 +52,18 @@
private String delFlag;
/** 鐖堕儴闂ㄥ悕绉� */
+ @TableField(exist = false)
private String parentName;
/** 閮ㄩ棬缂栧彿 */
private String deptNick;
/** 鍛樺伐鏁伴噺 */
+ @TableField(exist = false)
private Integer staffCount;
/** 瀛愰儴闂� */
+ @TableField(exist = false)
private List<SysDept> children = new ArrayList<SysDept>();
public Long getDeptId()
diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java b/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
index 942a700..c564959 100644
--- a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
+++ b/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.project.system.domain.SysDept;
@@ -12,7 +13,7 @@
* @author ruoyi
*/
@Mapper
-public interface SysDeptMapper
+public interface SysDeptMapper extends BaseMapper<SysDept>
{
/**
* 鏌ヨ閮ㄩ棬绠＄悊鏁版嵁
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 6bb8927..7773825 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -456,7 +456,7 @@
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
+ *
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
@@ -473,6 +473,9 @@
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPost(userIds);
+ // 鍒犻櫎鐢ㄦ埛涓庨儴闂ㄦ暟鎹�
+ sysUserDeptMapper.delete(new LambdaQueryWrapper<SysUserDept>()
+ .in(SysUserDept::getUserId, userIds));
return userMapper.deleteUserByIds(userIds);
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index dc4284a..d19b4fc 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
@@ -17,7 +18,7 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/roles")
+@RequestMapping("/projectManagement/roles")
@Api(value = "Roles", tags = "")
public class RolesController {
@@ -32,9 +33,11 @@
@PostMapping("/add")
@ApiOperation("鏂板")
- public AjaxResult add(@RequestBody Roles role) {
- role.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
- return AjaxResult.success(rolesservice.save(role));
+ public AjaxResult add(@RequestBody RoleDto roleDto) {
+ if (roleDto.getIsDefaultNo()) {
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
+ }
+ return AjaxResult.success(rolesservice.save(roleDto));
}
@PostMapping("/update")
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
new file mode 100644
index 0000000..a93b483
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
@@ -0,0 +1,12 @@
+package com.ruoyi.projectManagement.dto;
+
+import com.ruoyi.projectManagement.pojo.Roles;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RoleDto extends Roles {
+ // 鏄惁浣跨敤绯荤粺缂栧彿
+ @ApiModelProperty("鏄惁浣跨敤绯荤粺缂栧彿")
+ private Boolean isDefaultNo;
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/mapper/PlanMapper.java b/src/main/java/com/ruoyi/projectManagement/mapper/PlanMapper.java
new file mode 100644
index 0000000..3c5d707
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/mapper/PlanMapper.java
@@ -0,0 +1,21 @@
+package com.ruoyi.projectManagement.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.projectManagement.pojo.Plan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.projectManagement.vo.SearchPlanVo;
+
+/**
+* @author buhuazhen
+* @description 閽堝琛ㄣ�恜roject_management_plan(椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷))銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2026-03-06 15:29:26
+* @Entity generator.domain.ProjectManagementPlan
+*/
+public interface PlanMapper extends BaseMapper<Plan> {
+
+ IPage<Plan> selectPlanPage(SearchPlanVo searchPlanVo);
+}
+
+
+
+
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java b/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
new file mode 100644
index 0000000..3fa3a98
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
@@ -0,0 +1,84 @@
+package com.ruoyi.projectManagement.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)
+ * @TableName project_management_plan
+ */
+@TableName(value ="project_management_plan")
+@Data
+@ApiModel(description="椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
+public class Plan {
+ /**
+ *
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value="涓婚敭ID")
+ private Long id;
+
+ /**
+ * 璁″垝鍚嶇О
+ */
+ @TableField(value = "name")
+ @ApiModelProperty(value="璁″垝鍚嶇О")
+ private String name;
+
+ /**
+ * 璁″垝鎻忚堪
+ */
+ @TableField(value = "describe")
+ @ApiModelProperty(value="璁″垝鎻忚堪")
+ private String describe;
+
+ /**
+ * 闄勪欢 ,杩涜鍒嗗壊
+ */
+ @TableField(value = "attachment")
+ @ApiModelProperty(value="闄勪欢")
+ private String attachment;
+
+ /**
+ *
+ */
+ @TableField(value = "is_delete")
+ @ApiModelProperty(value="鏄惁鍒犻櫎")
+ private Integer isDelete;
+
+ /**
+ *
+ */
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
+ @ApiModelProperty(value="鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ /**
+ *
+ */
+ @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value="鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+
+ /**
+ *
+ */
+ @TableField(value = "create_user",fill = FieldFill.INSERT)
+ @ApiModelProperty(value="鍒涘缓浜�")
+ private String createUser;
+
+ /**
+ *
+ */
+ @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
+ @ApiModelProperty(value="鏇存柊浜�")
+ private String updateUser;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
index 9cd9dfa..c284f13 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
@@ -38,10 +38,6 @@
@ApiModelProperty(value="鐘舵��(1:鍚敤, 0:绂佺敤)")
private Integer status;
- @ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
diff --git a/src/main/java/com/ruoyi/projectManagement/service/PlanService.java b/src/main/java/com/ruoyi/projectManagement/service/PlanService.java
new file mode 100644
index 0000000..7eab7d8
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/service/PlanService.java
@@ -0,0 +1,34 @@
+package com.ruoyi.projectManagement.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.projectManagement.pojo.Plan;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.projectManagement.vo.PlanVo;
+import com.ruoyi.projectManagement.vo.SavePlanVo;
+import com.ruoyi.projectManagement.vo.SearchPlanVo;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @author buhuazhen
+* @description 閽堝琛ㄣ�恜roject_management_plan(椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷))銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2026-03-06 15:29:26
+*/
+public interface PlanService{
+
+ /**
+ * 淇濆瓨椤圭洰绠＄悊璁″垝
+ * @param savePlanVo
+ */
+ void savePlan(@NotNull SavePlanVo savePlanVo);
+
+ /**
+ * 鍒犻櫎椤圭洰绠＄悊璁″垝
+ * @param id
+ */
+ void deletePlan(@NotNull Long id);
+
+
+ IPage<PlanVo> searchPlan(@NotNull SearchPlanVo searchPlanVo);
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
new file mode 100644
index 0000000..4262f89
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
@@ -0,0 +1,81 @@
+package com.ruoyi.projectManagement.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ruoyi.basic.service.CustomerFollowUpFileService;
+import com.ruoyi.projectManagement.mapper.PlanMapper;
+import com.ruoyi.projectManagement.pojo.Plan;
+import com.ruoyi.projectManagement.service.PlanService;
+import com.ruoyi.projectManagement.vo.PlanVo;
+import com.ruoyi.projectManagement.vo.SavePlanVo;
+import com.ruoyi.projectManagement.vo.SearchPlanVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.Optional;
+
+/**
+ * @author buhuazhen
+ * @description 椤圭洰绠＄悊璁″垝鐨勫疄鐜�
+ * @createDate 2026-03-06 15:29:26
+ */
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class PlanServiceImpl implements PlanService {
+
+ private final PlanMapper planMapper;
+
+ private final CustomerFollowUpFileService customerFollowUpFileService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void savePlan(SavePlanVo savePlanVo) {
+ Plan plan = BeanUtil.copyProperties(savePlanVo, Plan.class);
+ // 闄勪欢澶勭悊 , 鎷兼帴
+ String attachments = String.join(",", Optional.ofNullable(savePlanVo.getAttachmentIds()).orElse(Collections.emptyList()));
+ plan.setAttachment(attachments);
+
+
+ if (savePlanVo.getId() == null) {
+ planMapper.insert(plan);
+ } else {
+ planMapper.updateById(plan);
+ }
+
+ // todo@ 鑺傜偣淇濆瓨
+
+
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePlan(Long id) {
+ planMapper.update(null,
+ new LambdaUpdateWrapper<Plan>()
+ .eq(Plan::getId, id)
+ .set(Plan::getIsDelete, 1));
+ // todo@ 瀵瑰簲鑺傜偣鍏ㄩ儴鍒犻櫎
+
+
+ }
+
+ @Override
+ public IPage<PlanVo> searchPlan(SearchPlanVo searchPlanVo) {
+ IPage<Plan> planIPage = planMapper.selectPlanPage(searchPlanVo);
+ IPage<PlanVo> resultPage = planIPage.convert(plan -> BeanUtil.copyProperties(plan, PlanVo.class));
+ // 鏂囦欢鑾峰彇
+ customerFollowUpFileService.fillAttachment(resultPage.getRecords(), PlanVo::getAttachment, PlanVo::setAttachmentList);
+ // todo@ node 鑺傜偣鑾峰彇
+
+ return resultPage;
+ }
+
+}
+
+
+
+
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
index f58c4ed..405084a 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
@@ -1,24 +1,32 @@
package com.ruoyi.projectManagement.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
+import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+@AllArgsConstructor
@Service
-@RequiredArgsConstructor
-@Transactional(rollbackFor = Exception.class)
public class RolesServiceImpl extends ServiceImpl<RolesMapper, Roles> implements RolesService {
private final RolesMapper rolesmapper;
@Override
public IPage<Roles> listPage(Page<Roles> page, Roles roles) {
- return rolesmapper.selectPage(page, null);
+ LambdaQueryWrapper<Roles> queryWrapper = new LambdaQueryWrapper<>();
+ if (roles.getName() != null) {
+ queryWrapper.like(Roles::getName, roles.getName());
+ }
+ if (roles.getStatus() != null) {
+ queryWrapper.eq(Roles::getStatus, roles.getStatus());
+ }
+ return rolesmapper.selectPage(page, queryWrapper);
}
}
diff --git a/src/main/java/com/ruoyi/projectManagement/vo/PlanVo.java b/src/main/java/com/ruoyi/projectManagement/vo/PlanVo.java
new file mode 100644
index 0000000..9ee78e9
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/vo/PlanVo.java
@@ -0,0 +1,40 @@
+package com.ruoyi.projectManagement.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.vo.SimpleFileVo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 璁″垝VO
+ * @author buhuazhen
+ * @date 2026/3/6
+ * @email 3038525872@qq.com
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PlanVo implements Serializable {
+
+ private Long id;
+
+ private String name;
+
+ private String describe;
+
+ // 闄勪欢
+ private List<SimpleFileVo> attachmentList;
+
+ @JsonIgnore
+ private String attachment;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/vo/SavePlanVo.java b/src/main/java/com/ruoyi/projectManagement/vo/SavePlanVo.java
new file mode 100644
index 0000000..5c79940
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/vo/SavePlanVo.java
@@ -0,0 +1,31 @@
+package com.ruoyi.projectManagement.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author buhuazhen
+ * @date 2026/3/6
+ * @email 3038525872@qq.com
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SavePlanVo implements Serializable {
+
+ private Long id;
+ @NotBlank
+ private String name;
+ @NotBlank
+ private String describe;
+
+ private List<String> attachmentIds;
+
+
+
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/vo/SearchPlanVo.java b/src/main/java/com/ruoyi/projectManagement/vo/SearchPlanVo.java
new file mode 100644
index 0000000..d4d4ad0
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/vo/SearchPlanVo.java
@@ -0,0 +1,21 @@
+package com.ruoyi.projectManagement.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author buhuazhen
+ * @date 2026/3/6
+ * @email 3038525872@qq.com
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SearchPlanVo extends Page implements Serializable {
+
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
new file mode 100644
index 0000000..42363af
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@RestController
+@RequestMapping("/purchaseReturnOrders")
+public class PurchaseReturnOrdersController {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
new file mode 100644
index 0000000..d2c1747
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.mapper;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@Mapper
+public interface PurchaseReturnOrdersMapper extends BaseMapper<PurchaseReturnOrders> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
new file mode 100644
index 0000000..c2004c3
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -0,0 +1,71 @@
+package com.ruoyi.purchase.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@Getter
+@Setter
+@TableName("purchase_return_orders")
+@ApiModel(value = "PurchaseReturnOrders瀵硅薄", description = "閲囪喘閫�璐у崟")
+public class PurchaseReturnOrders implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("閫�璐у崟缂栧彿")
+ private String no;
+
+ @ApiModelProperty("閫�璐ф柟寮� 0閫�璐ч��娆� 1鎷掓敹")
+ private Integer returnType;
+
+ @ApiModelProperty("渚涘簲鍟唅d")
+ private Long supplierId;
+
+ @ApiModelProperty("椤圭洰id")
+ private Long projectId;
+
+ @ApiModelProperty("椤圭洰闃舵")
+ private Integer projectPhase;
+
+ @ApiModelProperty("鍒跺崟鏃ユ湡")
+ private LocalDateTime preparedAt;
+
+ @ApiModelProperty("鍒跺崟浜篿d")
+ private Long preparedUserId;
+
+ @ApiModelProperty("閫�鏂欎汉id")
+ private Long returnUserId;
+
+ @ApiModelProperty("閲囪喘璁㈠崟id")
+ private Long purchaseLedgerId;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("褰曞叆鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
new file mode 100644
index 0000000..6f165e1
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/PurchaseReturnOrdersService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.purchase.service;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+public interface PurchaseReturnOrdersService extends IService<PurchaseReturnOrders> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
new file mode 100644
index 0000000..f052d45
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseReturnOrdersServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.purchase.service.impl;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
+import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-06 11:44:38
+ */
+@Service
+public class PurchaseReturnOrdersServiceImpl extends ServiceImpl<PurchaseReturnOrdersMapper, PurchaseReturnOrders> implements PurchaseReturnOrdersService {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 0cf0797..db3c5b9 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -135,4 +135,10 @@
util.exportExcel(response, list, "鍙戣揣淇℃伅");
}
+
+ @GetMapping("/getByCustomerName")
+ @ApiOperation("閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
+ public AjaxResult getByCustomerName(String customerName) {
+ return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
+ }
}
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 78169a0..05bd888 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -43,6 +43,7 @@
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
+ private List<SalesLedgerProductDto> productDtoData;
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
index 41b380a..666ccf4 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -57,4 +58,11 @@
private Integer approvalStatus;
+
+ @ApiModelProperty(value = "鏈��璐ф暟")
+ private BigDecimal unQuantity;
+
+ @ApiModelProperty(value = "閫�璐ф�绘暟")
+ private BigDecimal totalReturnNum;
+
}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
index 9ab16d5..8cc8b29 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import org.apache.ibatis.annotations.Param;
@@ -17,4 +20,9 @@
IPage<ShippingInfoDto> listPage(Page page, @Param("req") ShippingInfo req);
List<ShippingInfo> listAll();
+
+ List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId);
+
+ List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
+
}
diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index d9a3a8c..3f2f1d3 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
@@ -19,4 +21,8 @@
boolean deductStock(ShippingInfoDto req) throws IOException;
boolean delete(List<Long> ids);
+
+ List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId);
+
+ List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index df94a16..1cdbebb 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -9,7 +9,9 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
+import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
@@ -107,4 +109,15 @@
return this.removeBatchByIds(ids);
}
+
+ @Override
+ public List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId) {
+ return shippingInfoMapper.getReturnManagementDtoById(shippingId);
+
+ }
+
+ @Override
+ public List<ShippingInfo> getShippingInfoByCustomerName(String customerName) {
+ return shippingInfoMapper.getShippingInfoByCustomerName(customerName);
+ }
}
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
new file mode 100644
index 0000000..39f1ef0
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.staff.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.staff.pojo.SchemeApplicableStaff;
+import com.ruoyi.staff.service.SchemeApplicableStaffService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 绀句繚鏂规閫傜敤浜哄憳琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:50:17
+ */
+@Api(tags = "绀句繚鏂规閫傜敤浜哄憳琛�")
+@RestController
+@RequestMapping("/schemeApplicableStaff")
+public class SchemeApplicableStaffController extends BaseController {
+
+
+ @Autowired
+ private SchemeApplicableStaffService schemeApplicableStaffService;
+
+
+ @GetMapping("/listPage")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ")
+ public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
+ }
+
+ @PostMapping("/add")
+ @ApiOperation(value = "娣诲姞")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ return schemeApplicableStaffService.add(schemeApplicableStaff);
+ }
+
+ @PostMapping("/updateSchemeApplicableStaff")
+ @ApiOperation(value = "淇敼")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.UPDATE)
+ public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ return schemeApplicableStaffService.updateSchemeApplicableStaff(schemeApplicableStaff);
+ }
+
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "鍒犻櫎")
+ @Transactional(rollbackFor = Exception.class)
+ @Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return schemeApplicableStaffService.delete(ids);
+ }
+
+
+
+}
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeInsuranceDetailController.java b/src/main/java/com/ruoyi/staff/controller/SchemeInsuranceDetailController.java
new file mode 100644
index 0000000..488be7e
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeInsuranceDetailController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:52:23
+ */
+@RestController
+@RequestMapping("/schemeInsuranceDetail")
+public class SchemeInsuranceDetailController {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffEducationController.java b/src/main/java/com/ruoyi/staff/controller/StaffEducationController.java
new file mode 100644
index 0000000..21c4972
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/StaffEducationController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍛樺伐鏁欒偛缁忓巻琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:08
+ */
+@RestController
+@RequestMapping("/staffEducation")
+public class StaffEducationController {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffEmergencyContactController.java b/src/main/java/com/ruoyi/staff/controller/StaffEmergencyContactController.java
new file mode 100644
index 0000000..45abcdc
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/StaffEmergencyContactController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍛樺伐绱ф�ヨ仈绯讳汉琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:34:17
+ */
+@RestController
+@RequestMapping("/staffEmergencyContact")
+public class StaffEmergencyContactController {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffWorkExperienceController.java b/src/main/java/com/ruoyi/staff/controller/StaffWorkExperienceController.java
new file mode 100644
index 0000000..60a71ba
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/controller/StaffWorkExperienceController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍛樺伐宸ヤ綔缁忓巻琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:36
+ */
+@RestController
+@RequestMapping("/staffWorkExperience")
+public class StaffWorkExperienceController {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 7afd407..0a2c0ae 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -18,8 +19,10 @@
private String contractTerm;
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractEndTime;
}
diff --git a/src/main/java/com/ruoyi/staff/mapper/SchemeApplicableStaffMapper.java b/src/main/java/com/ruoyi/staff/mapper/SchemeApplicableStaffMapper.java
new file mode 100644
index 0000000..ebb385d
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/mapper/SchemeApplicableStaffMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.mapper;
+
+import com.ruoyi.staff.pojo.SchemeApplicableStaff;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 绀句繚鏂规閫傜敤浜哄憳琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:50:17
+ */
+@Mapper
+public interface SchemeApplicableStaffMapper extends BaseMapper<SchemeApplicableStaff> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/mapper/SchemeInsuranceDetailMapper.java b/src/main/java/com/ruoyi/staff/mapper/SchemeInsuranceDetailMapper.java
new file mode 100644
index 0000000..fe7251b
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/mapper/SchemeInsuranceDetailMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.mapper;
+
+import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:52:23
+ */
+@Mapper
+public interface SchemeInsuranceDetailMapper extends BaseMapper<SchemeInsuranceDetail> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffEducationMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffEducationMapper.java
new file mode 100644
index 0000000..0ebce7e
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffEducationMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.mapper;
+
+import com.ruoyi.staff.pojo.StaffEducation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鍛樺伐鏁欒偛缁忓巻琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:08
+ */
+@Mapper
+public interface StaffEducationMapper extends BaseMapper<StaffEducation> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffEmergencyContactMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffEmergencyContactMapper.java
new file mode 100644
index 0000000..6ef19ed
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffEmergencyContactMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.mapper;
+
+import com.ruoyi.staff.pojo.StaffEmergencyContact;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鍛樺伐绱ф�ヨ仈绯讳汉琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:34:17
+ */
+@Mapper
+public interface StaffEmergencyContactMapper extends BaseMapper<StaffEmergencyContact> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffWorkExperienceMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffWorkExperienceMapper.java
new file mode 100644
index 0000000..9077d40
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffWorkExperienceMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.staff.mapper;
+
+import com.ruoyi.staff.pojo.StaffWorkExperience;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鍛樺伐宸ヤ綔缁忓巻琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:36
+ */
+@Mapper
+public interface StaffWorkExperienceMapper extends BaseMapper<StaffWorkExperience> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
new file mode 100644
index 0000000..e61df92
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
@@ -0,0 +1,84 @@
+package com.ruoyi.staff.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 绀句繚鏂规閫傜敤浜哄憳琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:50:17
+ */
+@Getter
+@Setter
+@TableName("scheme_applicable_staff")
+@ApiModel(value = "SchemeApplicableStaff瀵硅薄", description = "绀句繚鏂规閫傜敤浜哄憳琛�")
+public class SchemeApplicableStaff implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("绀句繚鏂规淇濋櫓绂忓埄鏄庣粏")
+ @TableField(exist = false)
+ private List<SchemeInsuranceDetail> schemeInsuranceDetailList;
+
+ @ApiModelProperty("涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鏍囬")
+ private String title;
+
+ @ApiModelProperty("閮ㄩ棬ids,澶氫釜浣跨敤,闅斿紑")
+ private String deptIds;
+
+ @ApiModelProperty("閮ㄩ棬鍚嶇О,澶氫釜浣跨敤,闅斿紑")
+ @TableField(exist = false)
+ private String deptNames;
+
+ @ApiModelProperty("浜哄憳鍚嶇О,澶氫釜浣跨敤,闅斿紑")
+ private String staffNames;
+
+ @ApiModelProperty("浜哄憳id,澶氫釜浣跨敤,闅斿紑")
+ private String staffIds;
+
+ @ApiModelProperty("淇濋櫓绫诲瀷鍚嶇О澶氫釜浣跨敤,闅斿紑")
+ private String insuranceTypes;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ private String createUserName;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8", shape = JsonFormat.Shape.STRING)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鏇存柊浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+}
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java b/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
new file mode 100644
index 0000000..9facc7b
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
@@ -0,0 +1,69 @@
+package com.ruoyi.staff.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:52:23
+ */
+@Getter
+@Setter
+@TableName("scheme_insurance_detail")
+@ApiModel(value = "SchemeInsuranceDetail瀵硅薄", description = "绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛�")
+public class SchemeInsuranceDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("鏄庣粏ID锛堜富閿級")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鍏宠仈鐨勭ぞ淇濇柟妗圛D")
+ private Long schemeId;
+
+ @ApiModelProperty("淇濋櫓绫诲瀷锛堝鍖荤枟淇濋櫓銆佸吇鑰佷繚闄╃瓑锛�")
+ private String insuranceType;
+
+ @ApiModelProperty("缂磋垂鍩烘暟")
+ private BigDecimal paymentBase;
+
+ @ApiModelProperty("鏄惁璋冪敤鍩烘湰宸ヨ祫锛�1-鍚︼紝2-鏄�")
+ private Integer useBasicSalary;
+
+ @ApiModelProperty("涓汉缂磋垂姣斾緥锛�%锛�")
+ private BigDecimal personalRatio;
+
+ @ApiModelProperty("涓汉鍥哄畾缂磋垂閲戦")
+ private BigDecimal personalFixed;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty("鏇存柊浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
new file mode 100644
index 0000000..8f7a35e
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
@@ -0,0 +1,79 @@
+package com.ruoyi.staff.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 鍛樺伐鏁欒偛缁忓巻琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:08
+ */
+@Getter
+@Setter
+@TableName("staff_education")
+@ApiModel(value = "StaffEducation瀵硅薄", description = "鍛樺伐鏁欒偛缁忓巻琛�")
+public class StaffEducation implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ private Long staffOnJobId;
+
+ @ApiModelProperty("瀛﹀巻")
+ private String education;
+
+ @ApiModelProperty("姣曚笟闄㈡牎")
+ private String schoolName;
+
+ @ApiModelProperty("鍏ュ鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate enrollTime;
+
+ @ApiModelProperty("姣曚笟鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate graduateTime;
+
+ @ApiModelProperty("涓撲笟")
+ private String major;
+
+ @ApiModelProperty("瀛︿綅")
+ private String degree;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java b/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
new file mode 100644
index 0000000..1fdeefa
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
@@ -0,0 +1,65 @@
+package com.ruoyi.staff.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鍛樺伐绱ф�ヨ仈绯讳汉琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:34:17
+ */
+@Getter
+@Setter
+@TableName("staff_emergency_contact")
+@ApiModel(value = "StaffEmergencyContact瀵硅薄", description = "鍛樺伐绱ф�ヨ仈绯讳汉琛�")
+public class StaffEmergencyContact implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ private Long staffOnJobId;
+
+ @ApiModelProperty("绱ф�ヨ仈绯讳汉濮撳悕")
+ private String contactName;
+
+ @ApiModelProperty("绱ф�ヨ仈绯讳汉鍏崇郴")
+ private String contactRelation;
+
+ @ApiModelProperty("绱ф�ヨ仈绯讳汉鎵嬫満")
+ private String contactPhone;
+
+ @ApiModelProperty("绱ф�ヨ仈绯讳汉浣忓潃")
+ private String contactAddress;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 785b722..cca0284 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* 浜哄憳绠＄悊--鍛樺伐鍙拌处/鍚堝悓绠＄悊
@@ -67,6 +68,11 @@
* 閮ㄩ棬
*/
private Long sysDeptId;
+
+ /**
+ * 瑙掕壊
+ */
+ private Long roleId;
/**
* 瀹跺涵浣忓潃
@@ -203,5 +209,42 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒悕")
+ private String alias;
+
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthDate;
+
+ @ApiModelProperty(value = "姘戞棌")
+ private String nation;
+
+ @ApiModelProperty(value = "濠氬Щ鐘跺喌")
+ private String maritalStatus;
+
+ @ApiModelProperty(value = "璇曠敤鏈燂紙鏈堬級")
+ private Integer proTerm;
+
+ @ApiModelProperty(value = "杞鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date positiveDate;
+
+ @ApiModelProperty(value = "鍩烘湰宸ヨ祫")
+ private BigDecimal basicSalary;
+
+ @ApiModelProperty(value = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
+ @TableField(exist = false)
+ private List<StaffEducation> staffEducationList;
+
+ @ApiModelProperty(value = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
+ @TableField(exist = false)
+ private List<StaffWorkExperience> staffWorkExperienceList;
+
+ @ApiModelProperty(value = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
+ @TableField(exist = false)
+ private List<StaffEmergencyContact> staffEmergencyContactList;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java b/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
new file mode 100644
index 0000000..6d59f83
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
@@ -0,0 +1,79 @@
+package com.ruoyi.staff.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 鍛樺伐宸ヤ綔缁忓巻琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:36
+ */
+@Getter
+@Setter
+@TableName("staff_work_experience")
+@ApiModel(value = "StaffWorkExperience瀵硅薄", description = "鍛樺伐宸ヤ綔缁忓巻琛�")
+public class StaffWorkExperience implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ private Long staffOnJobId;
+
+ @ApiModelProperty("鍓嶅叕鍙�")
+ private String formerCompany;
+
+ @ApiModelProperty("鍓嶅叕鍙搁儴闂�")
+ private String formerDept;
+
+ @ApiModelProperty("鍓嶅叕鍙歌亴浣�")
+ private String formerPosition;
+
+ @ApiModelProperty("寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startDate;
+
+ @ApiModelProperty("缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endDate;
+
+ @ApiModelProperty("宸ヤ綔鎻忚堪")
+ private String workDesc;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+}
diff --git a/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java b/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
new file mode 100644
index 0000000..da9a2d7
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
@@ -0,0 +1,27 @@
+package com.ruoyi.staff.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.staff.pojo.SchemeApplicableStaff;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 绀句繚鏂规閫傜敤浜哄憳琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:50:17
+ */
+public interface SchemeApplicableStaffService extends IService<SchemeApplicableStaff> {
+
+ AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff);
+
+ AjaxResult add(SchemeApplicableStaff schemeApplicableStaff);
+
+ AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff);
+
+ AjaxResult delete(List<Long> ids);
+}
diff --git a/src/main/java/com/ruoyi/staff/service/SchemeInsuranceDetailService.java b/src/main/java/com/ruoyi/staff/service/SchemeInsuranceDetailService.java
new file mode 100644
index 0000000..3d698e7
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/SchemeInsuranceDetailService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.staff.service;
+
+import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:52:23
+ */
+public interface SchemeInsuranceDetailService extends IService<SchemeInsuranceDetail> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/StaffEducationService.java b/src/main/java/com/ruoyi/staff/service/StaffEducationService.java
new file mode 100644
index 0000000..ccafc8b
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/StaffEducationService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.staff.service;
+
+import com.ruoyi.staff.pojo.StaffEducation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鍛樺伐鏁欒偛缁忓巻琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:08
+ */
+public interface StaffEducationService extends IService<StaffEducation> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/StaffEmergencyContactService.java b/src/main/java/com/ruoyi/staff/service/StaffEmergencyContactService.java
new file mode 100644
index 0000000..65081f4
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/StaffEmergencyContactService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.staff.service;
+
+import com.ruoyi.staff.pojo.StaffEmergencyContact;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鍛樺伐绱ф�ヨ仈绯讳汉琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:34:17
+ */
+public interface StaffEmergencyContactService extends IService<StaffEmergencyContact> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/StaffWorkExperienceService.java b/src/main/java/com/ruoyi/staff/service/StaffWorkExperienceService.java
new file mode 100644
index 0000000..a16d84d
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/StaffWorkExperienceService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.staff.service;
+
+import com.ruoyi.staff.pojo.StaffWorkExperience;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鍛樺伐宸ヤ綔缁忓巻琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:36
+ */
+public interface StaffWorkExperienceService extends IService<StaffWorkExperience> {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
new file mode 100644
index 0000000..f06704d
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -0,0 +1,153 @@
+package com.ruoyi.staff.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUserDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper;
+import com.ruoyi.staff.pojo.SchemeApplicableStaff;
+import com.ruoyi.staff.mapper.SchemeApplicableStaffMapper;
+import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
+import com.ruoyi.staff.service.SchemeApplicableStaffService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 绀句繚鏂规閫傜敤浜哄憳琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:50:17
+ */
+@Service
+public class SchemeApplicableStaffServiceImpl extends ServiceImpl<SchemeApplicableStaffMapper, SchemeApplicableStaff> implements SchemeApplicableStaffService {
+
+ @Autowired
+ private SchemeApplicableStaffMapper schemeApplicableStaffMapper;
+
+ @Autowired
+ private SchemeInsuranceDetailMapper schemeInsuranceDetailMapper;
+
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+
+
+ @Override
+ public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ LambdaQueryWrapper<SchemeApplicableStaff> schemeApplicableStaffLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(schemeApplicableStaff != null){
+ if(StringUtils.isNotEmpty(schemeApplicableStaff.getTitle())){
+ schemeApplicableStaffLambdaQueryWrapper.like(SchemeApplicableStaff::getTitle, schemeApplicableStaff.getTitle());
+ }
+ }
+ Page<SchemeApplicableStaff> page1 = schemeApplicableStaffMapper.selectPage(page, schemeApplicableStaffLambdaQueryWrapper);
+ List<Long> collect = page1.getRecords().stream().map(SchemeApplicableStaff::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(collect)){
+ return AjaxResult.success(page1);
+ }
+ List<SchemeInsuranceDetail> schemeInsuranceDetails = schemeInsuranceDetailMapper
+ .selectList(new LambdaQueryWrapper<SchemeInsuranceDetail>()
+ .in(SchemeInsuranceDetail::getSchemeId, collect));
+ page1.getRecords().forEach(item -> {
+ item.setSchemeInsuranceDetailList(schemeInsuranceDetails
+ .stream()
+ .filter(detail -> detail.getSchemeId().equals(item.getId()))
+ .collect(Collectors.toList()));
+ SysUser sysUser = sysUserMapper.selectUserById(item.getCreateUser().longValue());
+ item.setCreateUserName(sysUser == null ? "鏈煡" : sysUser.getNickName());
+ // 鑾峰彇閮ㄩ棬淇℃伅
+ String[] split = item.getDeptIds().split(",");
+ List<SysDept> sysDepts = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+ .in(SysDept::getDeptId, Arrays.stream(split).map(Long::valueOf).collect(Collectors.toList())));
+ if(!CollectionUtils.isEmpty(sysDepts)){
+ item.setDeptNames(sysDepts.stream().map(SysDept::getDeptName).collect(Collectors.joining(",")));
+ }
+ });
+ return AjaxResult.success(page1);
+ }
+
+ public void setSchemeApplicableStaffUserInfo(SchemeApplicableStaff schemeApplicableStaff) {
+ // 閫氳繃閮ㄩ棬鑾峰彇浜哄憳id
+ List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectList(new LambdaQueryWrapper<SysUserDept>()
+ .in(SysUserDept::getDeptId, schemeApplicableStaff.getDeptIds()));
+ if(CollectionUtils.isEmpty(sysUserDepts)){
+ throw new IllegalArgumentException("閮ㄩ棬涓嬫棤鍛樺伐");
+ }
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(sysUserDepts.stream().map(SysUserDept::getUserId).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(sysUsers)){
+ throw new IllegalArgumentException("閮ㄩ棬涓嬫棤鍛樺伐");
+ }
+ schemeApplicableStaff.setStaffIds(sysUsers
+ .stream()
+ .map(SysUser::getUserId)
+ .filter(Objects::nonNull) // 杩囨护鎺� null 鍊�
+ .map(String::valueOf)
+ .collect(Collectors.joining( ",")));
+ schemeApplicableStaff.setStaffNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ }
+
+ @Override
+ public AjaxResult add(SchemeApplicableStaff schemeApplicableStaff) {
+ if(schemeApplicableStaff == null){
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ if(CollectionUtils.isEmpty(schemeApplicableStaff.getSchemeInsuranceDetailList())){
+ return AjaxResult.error("璇烽�夋嫨鏂规鏄庣粏");
+ }
+ setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
+ int insert = schemeApplicableStaffMapper.insert(schemeApplicableStaff);
+ schemeApplicableStaff.getSchemeInsuranceDetailList().forEach(item -> {
+ item.setSchemeId(schemeApplicableStaff.getId());
+ schemeInsuranceDetailMapper.insert(item);
+ });
+ return AjaxResult.success(insert);
+ }
+
+ @Override
+ public AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
+ if(schemeApplicableStaff == null){
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
+ int update = schemeApplicableStaffMapper.updateById(schemeApplicableStaff);
+ // 鍏堝垹锛岄噸鏂扮粦瀹�
+ schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
+ .eq(SchemeInsuranceDetail::getSchemeId, schemeApplicableStaff.getId()));
+ schemeApplicableStaff.getSchemeInsuranceDetailList().forEach(item -> {
+ item.setSchemeId(schemeApplicableStaff.getId());
+ schemeInsuranceDetailMapper.insert(item);
+ });
+ return AjaxResult.success(update);
+ }
+
+ @Override
+ public AjaxResult delete(List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ int delete = schemeApplicableStaffMapper.deleteBatchIds(ids);
+ schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
+ .in(SchemeInsuranceDetail::getSchemeId, ids));
+ return AjaxResult.success(delete);
+ }
+}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeInsuranceDetailServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeInsuranceDetailServiceImpl.java
new file mode 100644
index 0000000..801649e
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeInsuranceDetailServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.staff.service.impl;
+
+import com.ruoyi.staff.pojo.SchemeInsuranceDetail;
+import com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper;
+import com.ruoyi.staff.service.SchemeInsuranceDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 绀句繚鏂规淇濋櫓绂忓埄鏄庣粏琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 11:52:23
+ */
+@Service
+public class SchemeInsuranceDetailServiceImpl extends ServiceImpl<SchemeInsuranceDetailMapper, SchemeInsuranceDetail> implements SchemeInsuranceDetailService {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffEducationServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffEducationServiceImpl.java
new file mode 100644
index 0000000..81acfb9
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffEducationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.staff.service.impl;
+
+import com.ruoyi.staff.pojo.StaffEducation;
+import com.ruoyi.staff.mapper.StaffEducationMapper;
+import com.ruoyi.staff.service.StaffEducationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鍛樺伐鏁欒偛缁忓巻琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:08
+ */
+@Service
+public class StaffEducationServiceImpl extends ServiceImpl<StaffEducationMapper, StaffEducation> implements StaffEducationService {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffEmergencyContactServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffEmergencyContactServiceImpl.java
new file mode 100644
index 0000000..7a90966
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffEmergencyContactServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.staff.service.impl;
+
+import com.ruoyi.staff.pojo.StaffEmergencyContact;
+import com.ruoyi.staff.mapper.StaffEmergencyContactMapper;
+import com.ruoyi.staff.service.StaffEmergencyContactService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鍛樺伐绱ф�ヨ仈绯讳汉琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:34:17
+ */
+@Service
+public class StaffEmergencyContactServiceImpl extends ServiceImpl<StaffEmergencyContactMapper, StaffEmergencyContact> implements StaffEmergencyContactService {
+
+}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index d421345..8336f90 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -6,22 +6,25 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.WordDateDto;
import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysPostMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.system.service.impl.SysUserServiceImpl;
import com.ruoyi.staff.dto.StaffOnJobDto;
-import com.ruoyi.staff.mapper.StaffContractMapper;
-import com.ruoyi.staff.mapper.StaffLeaveMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
-import com.ruoyi.staff.pojo.StaffContract;
-import com.ruoyi.staff.pojo.StaffLeave;
-import com.ruoyi.staff.pojo.StaffOnJob;
+import com.ruoyi.staff.mapper.*;
+import com.ruoyi.staff.pojo.*;
import com.ruoyi.staff.service.IStaffOnJobService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ListUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,6 +38,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
+import java.util.stream.Collectors;
@AllArgsConstructor
@Service
@@ -50,6 +54,30 @@
@Autowired
private StaffLeaveMapper staffLeaveMapper;
+ @Autowired
+ private SysUserServiceImpl sysUserService;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ @Autowired
+ private StaffEducationServiceImpl staffEducationService;
+
+ @Autowired
+ private StaffEducationMapper staffEducationMapper;
+
+ @Autowired
+ private StaffWorkExperienceMapper staffWorkExperienceMapper;
+
+ @Autowired
+ private StaffWorkExperienceServiceImpl staffWorkExperienceServiceImpl;
+
+ @Autowired
+ private StaffEmergencyContactMapper staffEmergencyContactMapper;
+
+ @Autowired
+ private StaffEmergencyContactServiceImpl staffEmergencyContactServiceImpl;
+
//鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ
@Override
@@ -64,14 +92,33 @@
String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
// 鍒ゆ柇缂栧彿鏄惁瀛樺湪
List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffNo, staffOnJobPrams.getStaffNo()));
- if (staffOnJobs.size()>0){
+ if (staffOnJobs != null && !staffOnJobs.isEmpty()){
throw new BaseException("缂栧彿涓�"+staffOnJobPrams.getStaffNo()+"鐨勫憳宸ュ凡缁忓瓨鍦�,鏃犳硶鏂板!!!");
}
+
// 鍒涘缓鍏ヨ亴鏁版嵁
staffOnJobPrams.setContractExpireTime(staffOnJobPrams.getContractEndTime());
staffOnJobPrams.setStaffState(1);
staffOnJobMapper.insert(staffOnJobPrams);
-
+ // 鏌ヨ鐢ㄦ埛鏄惁宸茬粡鏂板
+ SysUser sysUser = sysUserService.selectUserById(staffOnJobPrams.getId());
+ if(sysUser == null){
+ SysUser sysUser1 = new SysUser();
+ sysUser1.setUserName(staffOnJobPrams.getStaffNo());
+ sysUser1.setNickName(staffOnJobPrams.getStaffName());
+ String s = SecurityUtils.encryptPassword("123456");
+ sysUser1.setPassword(s);
+ if(staffOnJobPrams.getSysPostId() != null){
+ Long[] posts = new Long[]{staffOnJobPrams.getSysPostId().longValue()};
+ sysUser1.setPostIds(posts);
+ }
+ sysUser1.setRoleIds(new Long[]{staffOnJobPrams.getRoleId()});
+ sysUser1.setDeptIds(new Long[]{staffOnJobPrams.getSysDeptId()});
+ sysUser1.setStatus("0");
+ sysUserService.insertUser(sysUser1);
+ }
+ // 缁戝畾瀛愯〃鏁版嵁
+ bingingStaffOnJobExtra(staffOnJobPrams.getId(),staffOnJobPrams);
// 鍒涘缓鍚堝悓璁板綍
StaffContract staffContract = new StaffContract();
staffContract.setStaffOnJobId(staffOnJobPrams.getId());
@@ -103,19 +150,81 @@
staffContractMapper.updateById(contract);
}
+ // 鍒犻櫎鎵�鏈夊瓙琛ㄦ暟鎹�
+ delStaffOnJobExtra(Arrays.asList(id));
+ // 缁戝畾瀛愯〃鏁版嵁
+ bingingStaffOnJobExtra(id,staffOnJobParams);
// 鏇存柊鍛樺伐鏁版嵁
staffOnJobParams.setContractExpireTime(staffOnJobParams.getContractEndTime());
return staffOnJobMapper.updateById(staffOnJobParams);
+ }
+
+ /**
+ * 缁戝畾鍛樺伐瀛愯〃鏁版嵁
+ * @param staffOnJobPrams
+ * @param id
+ */
+ public void bingingStaffOnJobExtra(Long id,StaffOnJob staffOnJobPrams) {
+ // 鏂板鏁欒偛缁忓巻
+ if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEducationList())){
+ staffOnJobPrams.getStaffEducationList().stream()
+ .filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
+ .forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
+ staffEducationService.saveBatch(staffOnJobPrams.getStaffEducationList());
+ }
+ // 鏂板宸ヤ綔缁忓巻
+ if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())){
+ staffOnJobPrams.getStaffWorkExperienceList().stream()
+ .filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
+ .forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
+ staffWorkExperienceServiceImpl.saveBatch(staffOnJobPrams.getStaffWorkExperienceList());
+ }
+ // 鏂板绱ф�ヨ仈绯讳汉
+ if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffEmergencyContactList())){
+ staffOnJobPrams.getStaffEmergencyContactList().stream()
+ .filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
+ .forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
+ staffEmergencyContactServiceImpl.saveBatch(staffOnJobPrams.getStaffEmergencyContactList());
+ }
+ }
+
+
+ /**
+ * 閫氳繃鍛樺伐id鍒犻櫎鏁欒偛缁忓巻锛屽伐浣滅粡鍘嗭紝绱ф�ヨ仈绯讳汉
+ * @param ids
+ * @return
+ */
+ public void delStaffOnJobExtra(List<Long> ids) {
+ // 鍒犻櫎鏁欒偛缁忓巻
+ staffEducationService.remove(Wrappers.<StaffEducation>lambdaQuery().in(StaffEducation::getStaffOnJobId,ids));
+ // 鍒犻櫎宸ヤ綔缁忓巻
+ staffWorkExperienceServiceImpl.remove(Wrappers.<StaffWorkExperience>lambdaQuery().in(StaffWorkExperience::getStaffOnJobId,ids));
+ // 鍒犻櫎绱ф�ヨ仈绯讳汉
+ staffEmergencyContactServiceImpl.remove(Wrappers.<StaffEmergencyContact>lambdaQuery().in(StaffEmergencyContact::getStaffOnJobId,ids));
}
//鍒犻櫎鍏ヨ亴
@Override
@Transactional(rollbackFor = Exception.class)
public int delStaffOnJobs(List<Integer> ids) {
+ List<StaffOnJob> staffOnJobs = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().in(StaffOnJob::getId, ids));
+ if(CollectionUtils.isEmpty(staffOnJobs)){
+ throw new BaseException("璇ュ憳宸ヤ笉瀛樺湪,鏃犳硶鍒犻櫎!!!");
+ }
// 鍒犻櫎鍏ヨ亴鏁版嵁
staffOnJobMapper.deleteBatchIds(ids);
// 鍒犻櫎绂昏亴鏁版嵁
staffLeaveMapper.delete(Wrappers.<StaffLeave>lambdaQuery().in(StaffLeave::getStaffOnJobId, ids));
+ // 鍒犻櫎鐢ㄦ埛鏁版嵁
+ List<SysUser> sysUsers = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery()
+ .in(SysUser::getUserName, staffOnJobs.stream().map(StaffOnJob::getStaffNo).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(sysUsers)){
+ Long[] longs = sysUsers.stream().map(SysUser::getUserId).toArray(Long[]::new);
+ sysUserService.deleteUserByIds(longs);
+ }
+ // 鍒犻櫎瀛愯〃鏁版嵁
+ delStaffOnJobExtra(ids.stream().map(Integer::longValue).collect(Collectors.toList()));
+
// 鍒犻櫎鍚堝悓鏁版嵁
return staffContractMapper.delete(Wrappers.<StaffContract>lambdaQuery().in(StaffContract::getStaffOnJobId, ids));
}
@@ -172,6 +281,13 @@
staffOnJobDto.setContractStartTime(contract.getContractStartTime());
staffOnJobDto.setContractEndTime(contract.getContractEndTime());
}
+ // 鑾峰彇瀛愯〃鏁版嵁
+ staffOnJobDto.setStaffEducationList(staffEducationMapper.selectList(Wrappers.<StaffEducation>lambdaQuery()
+ .eq(StaffEducation::getStaffOnJobId, staffOnJob.getId())));
+ staffOnJobDto.setStaffWorkExperienceList(staffWorkExperienceMapper.selectList(Wrappers.<StaffWorkExperience>lambdaQuery()
+ .eq(StaffWorkExperience::getStaffOnJobId, staffOnJob.getId())));
+ staffOnJobDto.setStaffEmergencyContactList(staffEmergencyContactMapper.selectList(Wrappers.<StaffEmergencyContact>lambdaQuery()
+ .eq(StaffEmergencyContact::getStaffOnJobId, staffOnJob.getId())));
return staffOnJobDto;
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffWorkExperienceServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffWorkExperienceServiceImpl.java
new file mode 100644
index 0000000..7d04d43
--- /dev/null
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffWorkExperienceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.staff.service.impl;
+
+import com.ruoyi.staff.pojo.StaffWorkExperience;
+import com.ruoyi.staff.mapper.StaffWorkExperienceMapper;
+import com.ruoyi.staff.service.StaffWorkExperienceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鍛樺伐宸ヤ綔缁忓巻琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-05 04:33:36
+ */
+@Service
+public class StaffWorkExperienceServiceImpl extends ServiceImpl<StaffWorkExperienceMapper, StaffWorkExperience> implements StaffWorkExperienceService {
+
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1ad20a0..9eff9ac 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -74,9 +74,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
index 41cd6ca..68e5909 100644
--- a/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
+++ b/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml
@@ -2,8 +2,11 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper">
- <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
- select * from after_sales_service
+ <select id="listPage" resultType="com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto">
+ select ass.*,
+ sl.sales_contract_no
+ from after_sales_service ass
+ left join sales_ledger sl on ass.sales_ledger_id = sl.id
where 1 = 1
<if test="req.feedbackDate != null">
AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
@@ -17,6 +20,20 @@
<if test="req.status != null and req.status != ''">
and status = #{req.status}
</if>
+ <if test="req.urgency != null">
+ and urgency = #{req.urgency}
+ </if>
+ <if test="req.serviceType != null">
+ and service_type = #{req.serviceType}
+ </if>
order by update_time desc
</select>
+ <select id="countAfterSalesService" resultType="com.ruoyi.aftersalesservice.dto.CountDto">
+ select
+ status,
+ count(1) as count
+ from after_sales_service
+ group by status
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
index ce8eb39..2e2d112 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -2,15 +2,55 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.procurementrecord.mapper.ReturnManagementMapper">
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ReturnManagement">
- select * from return_management
+ <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ReturnManagementDto">
+ select rm.*,
+ c.customer_name,
+ si.shipping_no,
+ sl.project_name,
+ sl.sales_contract_no,
+ sl.salesman
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join customer c on rm.customer_id = c.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
<where>
<if test="req.returnNo != null and req.returnNo != ''">
- and return_no like concat('%',#{req.returnNo},'%')
+ and rm.return_no like concat('%',#{req.returnNo},'%')
</if>
- <if test="req.returnType != null and req.returnType != ''">
- and return_type = #{req.returnType}
+ <if test="req.customerName != null and req.customerName != ''">
+ and c.customer_name like concat('%',#{req.customerName},'%')
+ </if>
+ <if test="req.projectName != null and req.projectName != ''">
+ and sl.project_name like concat('%',#{req.projectName},'%')
+ </if>
+ <if test="req.salesman != null and req.salesman != ''">
+ and sl.salesman like concat('%',#{req.salesman},'%')
+ </if>
+ <if test="req.shippingNo != null and req.shippingNo != ''">
+ and rm.shipping_no like concat('%',#{req.shippingNo},'%')
+ </if>
+ <if test="req.projectStage != null and req.projectStage != ''">
+ and rm.project_stage like concat('%',#{req.projectStage},'%')
+ </if>
+ <if test="req.maker != null and req.maker != ''">
+ and rm.maker like concat('%',#{req.maker},'%')
+ </if>
+ <if test="req.salesContractNo != null and req.salesContractNo != ''">
+ and sl.sales_contract_no like concat('%',#{req.salesContractNo},'%')
</if>
</where>
</select>
+ <select id="getReturnManagementDtoById" resultType="com.ruoyi.procurementrecord.dto.ReturnManagementDto">
+ select rm.*,
+ c.customer_name,
+ si.shipping_no,
+ sl.project_name,
+ sl.sales_contract_no,
+ sl.salesman
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join customer c on rm.customer_id = c.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.id = #{id}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
new file mode 100644
index 0000000..39fd27f
--- /dev/null
+++ b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.procurementrecord.mapper.ReturnSaleProductMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.procurementrecord.pojo.ReturnSaleProduct">
+ <id column="id" property="id" />
+ <result column="return_management_id" property="returnManagementId" />
+ <result column="return_sale_ledger_product_id" property="returnSaleLedgerProductId" />
+ <result column="num" property="num" />
+ <result column="status" property="status" />
+ </resultMap>
+ <select id="listReturnSaleProductDto" resultType="com.ruoyi.procurementrecord.dto.ReturnSaleProductDto">
+ select rsp.*,
+ slp.product_category as product_name,
+ slp.specification_model as model
+ from return_sale_product rsp
+ left join sales_ledger_product slp on rsp.return_sale_ledger_product_id = slp.id
+ where rsp.return_management_id = #{returnManagementId}
+
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/projectManagement/PlanMapper.xml b/src/main/resources/mapper/projectManagement/PlanMapper.xml
new file mode 100644
index 0000000..3578358
--- /dev/null
+++ b/src/main/resources/mapper/projectManagement/PlanMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.projectManagement.mapper.PlanMapper">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.projectManagement.pojo.Plan">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="describe" column="describe" jdbcType="VARCHAR"/>
+ <result property="attachment" column="attachment" jdbcType="VARCHAR"/>
+ <result property="is_delete" column="is_delete" jdbcType="INTEGER"/>
+ <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="update_time" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="create_user" column="create_user" jdbcType="VARCHAR"/>
+ <result property="update_user" column="update_user" jdbcType="VARCHAR"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,name,describe,
+ attachment,is_delete,create_time,
+ update_time,create_user,update_user
+ </sql>
+
+ <select id="selectPlanPage" resultMap="BaseResultMap">
+ select t1.*
+ from project_management_plan as t1
+ order by t1.create_time desc
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
new file mode 100644
index 0000000..8d23060
--- /dev/null
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.PurchaseReturnOrders">
+ <id column="id" property="id" />
+ <result column="no" property="no" />
+ <result column="return_type" property="returnType" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="project_id" property="projectId" />
+ <result column="project_phase" property="projectPhase" />
+ <result column="prepared_at" property="preparedAt" />
+ <result column="prepared_user_id" property="preparedUserId" />
+ <result column="return_user_id" property="returnUserId" />
+ <result column="purchase_ledger_id" property="purchaseLedgerId" />
+ <result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 89134d5..c5b3ae7 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -58,4 +58,29 @@
FROM shipping_info s
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
</select>
+ <select id="getReturnManagementDtoById" resultType="com.ruoyi.sales.dto.SalesLedgerProductDto">
+ SELECT
+ slp.*,
+ slp.quantity - COALESCE(rs.total_return_num, 0) AS un_quantity,
+ COALESCE(rs.total_return_num, 0) AS total_return_num
+ FROM shipping_info si
+ LEFT JOIN sales_ledger_product slp ON si.sales_ledger_product_id = slp.id
+ LEFT JOIN (
+ SELECT
+ return_sale_ledger_product_id,
+ SUM(num) AS total_return_num
+ FROM return_sale_product
+ <where>
+ <if test="productId != null">
+ AND return_sale_ledger_product_id = #{productId}
+ </if>
+ </where>
+ GROUP BY return_sale_ledger_product_id
+ ) rs ON rs.return_sale_ledger_product_id = slp.id
+ </select>
+ <select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
+ select * from shipping_info si
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where sl.customer_name = #{customerName}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml b/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml
new file mode 100644
index 0000000..4f2952d
--- /dev/null
+++ b/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.staff.mapper.SchemeApplicableStaffMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.SchemeApplicableStaff">
+ <id column="id" property="id" />
+ <result column="title" property="title" />
+ <result column="dept_ids" property="deptIds" />
+ <result column="staff_names" property="staffNames" />
+ <result column="staff_ids" property="staffIds" />
+ <result column="insurance_types" property="insuranceTypes" />
+ <result column="remark" property="remark" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/staff/SchemeInsuranceDetailMapper.xml b/src/main/resources/mapper/staff/SchemeInsuranceDetailMapper.xml
new file mode 100644
index 0000000..3aa237b
--- /dev/null
+++ b/src/main/resources/mapper/staff/SchemeInsuranceDetailMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.staff.mapper.SchemeInsuranceDetailMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.SchemeInsuranceDetail">
+ <id column="id" property="id" />
+ <result column="scheme_id" property="schemeId" />
+ <result column="insurance_type" property="insuranceType" />
+ <result column="payment_base" property="paymentBase" />
+ <result column="use_basic_salary" property="useBasicSalary" />
+ <result column="personal_ratio" property="personalRatio" />
+ <result column="personal_fixed" property="personalFixed" />
+ <result column="create_time" property="createTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/staff/StaffEducationMapper.xml b/src/main/resources/mapper/staff/StaffEducationMapper.xml
new file mode 100644
index 0000000..ddcba2d
--- /dev/null
+++ b/src/main/resources/mapper/staff/StaffEducationMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.staff.mapper.StaffEducationMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffEducation">
+ <id column="id" property="id" />
+ <result column="staff_on_job_id" property="staffOnJobId" />
+ <result column="education" property="education" />
+ <result column="school_name" property="schoolName" />
+ <result column="enroll_time" property="enrollTime" />
+ <result column="graduate_time" property="graduateTime" />
+ <result column="major" property="major" />
+ <result column="degree" property="degree" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/staff/StaffEmergencyContactMapper.xml b/src/main/resources/mapper/staff/StaffEmergencyContactMapper.xml
new file mode 100644
index 0000000..b5cc93f
--- /dev/null
+++ b/src/main/resources/mapper/staff/StaffEmergencyContactMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.staff.mapper.StaffEmergencyContactMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffEmergencyContact">
+ <id column="id" property="id" />
+ <result column="staff_on_job_id" property="staffOnJobId" />
+ <result column="contact_name" property="contactName" />
+ <result column="contact_relation" property="contactRelation" />
+ <result column="contact_phone" property="contactPhone" />
+ <result column="contact_address" property="contactAddress" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/staff/StaffWorkExperienceMapper.xml b/src/main/resources/mapper/staff/StaffWorkExperienceMapper.xml
new file mode 100644
index 0000000..1c4b9e5
--- /dev/null
+++ b/src/main/resources/mapper/staff/StaffWorkExperienceMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.staff.mapper.StaffWorkExperienceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffWorkExperience">
+ <id column="id" property="id" />
+ <result column="staff_on_job_id" property="staffOnJobId" />
+ <result column="former_company" property="formerCompany" />
+ <result column="former_dept" property="formerDept" />
+ <result column="former_position" property="formerPosition" />
+ <result column="start_date" property="startDate" />
+ <result column="end_date" property="endDate" />
+ <result column="work_desc" property="workDesc" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/system/SysDeptMapper.xml b/src/main/resources/mapper/system/SysDeptMapper.xml
index afc1130..ee5256f 100644
--- a/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -52,7 +52,7 @@
order by d.parent_id, d.order_num
</select>
- <select id="selectDeptListByRoleId" resultType="Long">
+ <select id="selectDeptListByRoleId" resultType="java.lang.Long">
select d.dept_id
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
@@ -165,7 +165,7 @@
update sys_dept set del_flag = '2' where dept_id = #{deptId}
</delete>
- <select id="maxLevelDeptId">
+ <select id="maxLevelDeptId" resultType="java.lang.Long">
WITH RECURSIVE DepartmentHierarchy AS (
SELECT dept_id, parent_id
FROM sys_dept
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index d837b7e..e4f818a 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -139,6 +139,7 @@
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
+ and u.del_flag = '0'
</select>
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
@@ -157,6 +158,7 @@
where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
+ and u.del_flag = '0'
</select>
<select id="selectRegistrantIds" resultType="com.ruoyi.project.system.domain.SysUser">
SELECT user_id, nick_name FROM sys_user
@@ -179,6 +181,7 @@
<foreach collection="userIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
+ and del_flag = '0'
</select>
<select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
parameterType="java.lang.String">
--
Gitblit v1.9.3