DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CRM提交更新

Browse Source
This commit is contained in:
hdka
2025-03-12 21:14:46 +08:00
parent 6fbac23101
commit 0ce49d1504
52 changed files with 2918 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeFilesController.java
View File

@@ -42,7 +42,6 @@ public class EmployeeFilesController extends BaseController {
/**
* 查询文件档案管理列表
*/
@SaCheckPermission("oa:files:list")
@GetMapping("/list")
public TableDataInfo<FileUser> list(EmployeeFilesBo bo, PageQuery pageQuery) {
return iEmployeeFilesService.queryPageList(bo, pageQuery);
@@ -53,7 +52,6 @@ public class EmployeeFilesController extends BaseController {
*
* @param userId 主键
*/
@SaCheckPermission("oa:files:query")
@GetMapping("/{userId}")
public R<UserFilesVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("userId") Long userId) {
@@ -63,7 +61,6 @@ public class EmployeeFilesController extends BaseController {
/**
* 新增文件档案管理
*/
@SaCheckPermission("oa:files:add")
@Log(title = "文件档案管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeOffboardingController.java
View File

@@ -42,7 +42,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 查询离职管理列表
*/
@SaCheckPermission("system:offboarding:list")
@GetMapping("/list")
public TableDataInfo<EmployeeOffboardingVo> list(EmployeeOffboardingBo bo, PageQuery pageQuery) {
return iEmployeeOffboardingService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 导出离职管理列表
*/
@SaCheckPermission("system:offboarding:export")
@Log(title = "离职管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(EmployeeOffboardingBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class EmployeeOffboardingController extends BaseController {
*
* @param offboardingId 主键
*/
@SaCheckPermission("system:offboarding:query")
@GetMapping("/{offboardingId}")
public R<EmployeeOffboardingVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long offboardingId) {
@@ -74,7 +71,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 新增离职管理
*/
@SaCheckPermission("system:offboarding:add")
@Log(title = "离职管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class EmployeeOffboardingController extends BaseController {
/**
* 修改离职管理
*/
@SaCheckPermission("system:offboarding:edit")
@Log(title = "离职管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class EmployeeOffboardingController extends BaseController {
*
* @param offboardingIds 主键串
*/
@SaCheckPermission("system:offboarding:remove")
@Log(title = "离职管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{offboardingIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeOnboardingController.java
View File

@@ -43,7 +43,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 查询入职管理列表
*/
@SaCheckPermission("system:onboarding:list")
@GetMapping("/list")
public TableDataInfo<EmployeeOnboardingVo> list(EmployeeOnboardingBo bo, PageQuery pageQuery) {
return iEmployeeOnboardingService.queryPageList(bo, pageQuery);
@@ -52,7 +51,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 导出入职管理列表
*/
@SaCheckPermission("system:onboarding:export")
@Log(title = "入职管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(EmployeeOnboardingBo bo, HttpServletResponse response) {
@@ -65,7 +63,6 @@ public class EmployeeOnboardingController extends BaseController {
*
* @param userId 主键
*/
@SaCheckPermission("system:onboarding:query")
@GetMapping("/{userId}")
public R<EmployeeOnboardingVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long userId) {
@@ -75,7 +72,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 新增入职管理
*/
@SaCheckPermission("system:onboarding:add")
@Log(title = "入职管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -86,7 +82,6 @@ public class EmployeeOnboardingController extends BaseController {
/**
* 修改入职管理
*/
@SaCheckPermission("system:onboarding:edit")
@Log(title = "入职管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -99,7 +94,6 @@ public class EmployeeOnboardingController extends BaseController {
*
* @param onboardingIds 主键串
*/
@SaCheckPermission("system:onboarding:remove")
@Log(title = "入职管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{onboardingIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

15
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBusinessController.java
View File

@@ -43,16 +43,22 @@ public class OaBusinessController extends BaseController {
/**
* 查询CRM 商机列表
*/
@SaCheckPermission("oa:business:list")
@GetMapping("/list")
public TableDataInfo<OaBusinessVo> list(OaBusinessBo bo, PageQuery pageQuery) {
return iOaBusinessService.queryPageList(bo, pageQuery);
}
/**
* 查询CRM 商机列表
*/
@GetMapping("/listByCustomer")
public TableDataInfo<OaBusinessVo> listByCustomer(OaBusinessBo bo, PageQuery pageQuery) {
return iOaBusinessService.queryPageList(bo, pageQuery);
}
/**
* 导出CRM 商机列表
*/
@SaCheckPermission("oa:business:export")
@Log(title = "CRM 商机", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaBusinessBo bo, HttpServletResponse response) {
@@ -65,7 +71,6 @@ public class OaBusinessController extends BaseController {
*
* @param businessId 主键
*/
@SaCheckPermission("oa:business:query")
@GetMapping("/{businessId}")
public R<OaBusinessVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long businessId) {
@@ -75,7 +80,6 @@ public class OaBusinessController extends BaseController {
/**
* 新增CRM 商机
*/
@SaCheckPermission("oa:business:add")
@Log(title = "CRM 商机", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -86,7 +90,6 @@ public class OaBusinessController extends BaseController {
/**
* 修改CRM 商机
*/
@SaCheckPermission("oa:business:edit")
@Log(title = "CRM 商机", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -99,7 +102,6 @@ public class OaBusinessController extends BaseController {
*
* @param businessIds 主键串
*/
@SaCheckPermission("oa:business:remove")
@Log(title = "CRM 商机", businessType = BusinessType.DELETE)
@DeleteMapping("/{businessIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -111,7 +113,6 @@ public class OaBusinessController extends BaseController {
/**
* 联查商机与产品以及其关联表
*/
@SaCheckPermission("oa:business:query")
@GetMapping("/BusinessProducts")
public TableDataInfo<OaProductVo> getBusinessProducts(OaBusinessBo bo) {
return iOaBusinessService.getBusinessProducts(bo);

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaBusinessProductController.java
View File

@@ -42,7 +42,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 查询CRM 商机产品关联列表
*/
@SaCheckPermission("oa:businessProduct:list")
@GetMapping("/list")
public TableDataInfo<OaBusinessProductVo> list(OaBusinessProductBo bo, PageQuery pageQuery) {
return iOaBusinessProductService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 导出CRM 商机产品关联列表
*/
@SaCheckPermission("oa:businessProduct:export")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaBusinessProductBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaBusinessProductController extends BaseController {
*
* @param businessProductId 主键
*/
@SaCheckPermission("oa:businessProduct:query")
@GetMapping("/{businessProductId}")
public R<OaBusinessProductVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long businessProductId) {
@@ -74,7 +71,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 新增CRM 商机产品关联
*/
@SaCheckPermission("oa:businessProduct:add")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class OaBusinessProductController extends BaseController {
/**
* 修改CRM 商机产品关联
*/
@SaCheckPermission("oa:businessProduct:edit")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class OaBusinessProductController extends BaseController {
*
* @param businessProductIds 主键串
*/
@SaCheckPermission("oa:businessProduct:remove")
@Log(title = "CRM 商机产品关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{businessProductIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

8
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaClueController.java
View File

@@ -42,16 +42,14 @@ public class OaClueController extends BaseController {
/**
* 查询CRM 线索列表
*/
@SaCheckPermission("oa:clue:list")
@GetMapping("/list")
public TableDataInfo<OaClueVo> list(OaClueBo bo, PageQuery pageQuery) {
return iOaClueService.queryPageList(bo, pageQuery);
return iOaClueService.queryPageListVo(bo, pageQuery);
}
/**
* 导出CRM 线索列表
*/
@SaCheckPermission("oa:clue:export")
@Log(title = "CRM 线索", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaClueBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaClueController extends BaseController {
*
* @param clueId 主键
*/
@SaCheckPermission("oa:clue:query")
@GetMapping("/{clueId}")
public R<OaClueVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long clueId) {
@@ -74,7 +71,6 @@ public class OaClueController extends BaseController {
/**
* 新增CRM 线索
*/
@SaCheckPermission("oa:clue:add")
@Log(title = "CRM 线索", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class OaClueController extends BaseController {
/**
* 修改CRM 线索
*/
@SaCheckPermission("oa:clue:edit")
@Log(title = "CRM 线索", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class OaClueController extends BaseController {
*
* @param clueIds 主键串
*/
@SaCheckPermission("oa:clue:remove")
@Log(title = "CRM 线索", businessType = BusinessType.DELETE)
@DeleteMapping("/{clueIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

18
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaCustomerController.java
View File

@@ -42,16 +42,22 @@ public class OaCustomerController extends BaseController {
/**
* 查询CRM 客户列表
*/
@SaCheckPermission("oa:customer:list")
@GetMapping("/list")
public TableDataInfo<OaCustomerVo> list(OaCustomerBo bo, PageQuery pageQuery) {
return iOaCustomerService.queryPageList(bo, pageQuery);
return iOaCustomerService.queryPageListToUser(bo, pageQuery);
}
/**
* 查询CRM 客户列表
*/
@GetMapping("/list-sea")
public TableDataInfo<OaCustomerVo> seaList(OaCustomerBo bo, PageQuery pageQuery) {
return iOaCustomerService.queryPageListToSea(bo, pageQuery);
}
/**
* 导出CRM 客户列表
*/
@SaCheckPermission("oa:customer:export")
@Log(title = "CRM 客户", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaCustomerBo bo, HttpServletResponse response) {
@@ -64,7 +70,6 @@ public class OaCustomerController extends BaseController {
*
* @param customerId 主键
*/
@SaCheckPermission("oa:customer:query")
@GetMapping("/{customerId}")
public R<OaCustomerVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long customerId) {
@@ -74,7 +79,6 @@ public class OaCustomerController extends BaseController {
/**
* 新增CRM 客户
*/
@SaCheckPermission("oa:customer:add")
@Log(title = "CRM 客户", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +89,7 @@ public class OaCustomerController extends BaseController {
/**
* 修改CRM 客户
*/
@SaCheckPermission("oa:customer:edit")
@Log(title = "CRM 客户", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +102,7 @@ public class OaCustomerController extends BaseController {
*
* @param customerIds 主键串
*/
@SaCheckPermission("oa:customer:remove")
@Log(title = "CRM 客户", businessType = BusinessType.DELETE)
@DeleteMapping("/{customerIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

25
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFollowUpRecordController.java
View File

@@ -1,9 +1,12 @@
package com.ruoyi.oa.controller;
import java.util.Collections;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.service.IOaBusinessProductService;
import com.ruoyi.oa.service.IOaBusinessService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -34,15 +37,17 @@ import com.ruoyi.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/followUpRecord")
@RequestMapping("/oa/followUpRecord")
public class OaFollowUpRecordController extends BaseController {
private final IOaFollowUpRecordService iOaFollowUpRecordService;
private final IOaBusinessService iOaBusinessService;
/**
* 查询CRM 跟进记录列表
*/
@SaCheckPermission("system:followUpRecord:list")
@GetMapping("/list")
public TableDataInfo<OaFollowUpRecordVo> list(OaFollowUpRecordBo bo, PageQuery pageQuery) {
return iOaFollowUpRecordService.queryPageList(bo, pageQuery);
@@ -51,7 +56,6 @@ public class OaFollowUpRecordController extends BaseController {
/**
* 导出CRM 跟进记录列表
*/
@SaCheckPermission("system:followUpRecord:export")
@Log(title = "CRM 跟进记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaFollowUpRecordBo bo, HttpServletResponse response) {
@@ -64,17 +68,26 @@ public class OaFollowUpRecordController extends BaseController {
*
* @param followId 主键
*/
@SaCheckPermission("system:followUpRecord:query")
@GetMapping("/{followId}")
public R<OaFollowUpRecordVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long followId) {
return R.ok(iOaFollowUpRecordService.queryById(followId));
}
/**
* CRM 商机
*
* @param businessIds 主键串
*/
@GetMapping("/listByIds/{businessIds}")
public R<List<OaFollowUpRecordVo>> selectByBusinessIds(
@PathVariable("businessIds") Long[] businessIds) {
return R.ok(iOaFollowUpRecordService.selectByBusinessIds(Arrays.asList(businessIds)));
}
/**
* 新增CRM 跟进记录
*/
@SaCheckPermission("system:followUpRecord:add")
@Log(title = "CRM 跟进记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +98,6 @@ public class OaFollowUpRecordController extends BaseController {
/**
* 修改CRM 跟进记录
*/
@SaCheckPermission("system:followUpRecord:edit")
@Log(title = "CRM 跟进记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +110,6 @@ public class OaFollowUpRecordController extends BaseController {
*
* @param followIds 主键串
*/
@SaCheckPermission("system:followUpRecord:remove")
@Log(title = "CRM 跟进记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{followIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaProductController.java
View File

@@ -42,7 +42,6 @@ public class OaProductController extends BaseController {
/**
* 查询CRM 产品列表
*/
@SaCheckPermission("oa:product:list")
@GetMapping("/list")
public TableDataInfo<OaProductVo> list(OaProductBo bo, PageQuery pageQuery) {
return iOaProductService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class OaProductController extends BaseController {
/**
* 导出CRM 产品列表
*/
@SaCheckPermission("oa:product:export")
@Log(title = "CRM 产品", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaProductBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaProductController extends BaseController {
*
* @param productId 主键
*/
@SaCheckPermission("oa:product:query")
@GetMapping("/{productId}")
public R<OaProductVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long productId) {
@@ -74,7 +71,6 @@ public class OaProductController extends BaseController {
/**
* 新增CRM 产品
*/
@SaCheckPermission("oa:product:add")
@Log(title = "CRM 产品", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class OaProductController extends BaseController {
/**
* 修改CRM 产品
*/
@SaCheckPermission("oa:product:edit")
@Log(title = "CRM 产品", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class OaProductController extends BaseController {
*
* @param productIds 主键串
*/
@SaCheckPermission("oa:product:remove")
@Log(title = "CRM 产品", businessType = BusinessType.DELETE)
@DeleteMapping("/{productIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryController.java
View File

@@ -42,7 +42,6 @@ public class OaSalaryController extends BaseController {
/**
* 查询薪资管理列表
*/
@SaCheckPermission("oa:salary:list")
@GetMapping("/list-staff")
public TableDataInfo<OaSalaryVo> list(OaSalaryBo bo, PageQuery pageQuery) {
return iOaSalaryService.queryPageList(bo, pageQuery);
@@ -50,7 +49,6 @@ public class OaSalaryController extends BaseController {
/**
* 查询薪资管理列表
*/
@SaCheckPermission("oa:salary:list")
@GetMapping("/list-worker")
public TableDataInfo<OaSalaryVo> listWorker(OaSalaryBo bo, PageQuery pageQuery) {
return iOaSalaryService.listWorker(bo, pageQuery);
@@ -67,7 +65,6 @@ public class OaSalaryController extends BaseController {
/**
* 导出薪资管理列表
*/
@SaCheckPermission("oa:salary:export")
@Log(title = "薪资管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaSalaryBo bo, HttpServletResponse response) {
@@ -79,7 +76,6 @@ public class OaSalaryController extends BaseController {
* 获取薪资管理详细信息
*
*/
@SaCheckPermission("oa:salary:query")
@GetMapping("/detail")
public R<OaSalaryVo> getInfo(@RequestBody OaSalaryBo bo) {
return R.ok(iOaSalaryService.queryById(bo.getSalaryId(),bo.getPayTime()));
@@ -88,7 +84,6 @@ public class OaSalaryController extends BaseController {
/**
* 新增薪资管理
*/
@SaCheckPermission("oa:salary:add")
@Log(title = "薪资管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -99,7 +94,6 @@ public class OaSalaryController extends BaseController {
/**
* 修改薪资管理
*/
@SaCheckPermission("oa:salary:edit")
@Log(title = "薪资管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -112,7 +106,6 @@ public class OaSalaryController extends BaseController {
*
* @param salaryIds 主键串
*/
@SaCheckPermission("oa:salary:remove")
@Log(title = "薪资管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{salaryIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryItemController.java
View File

@@ -42,7 +42,6 @@ public class OaSalaryItemController extends BaseController {
/**
* 查询薪水详情列表
*/
@SaCheckPermission("oa:salaryItem:list")
@GetMapping("/list")
public TableDataInfo<OaSalaryItemVo> list(OaSalaryItemBo bo, PageQuery pageQuery) {
return iOaSalaryItemService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class OaSalaryItemController extends BaseController {
/**
* 导出薪水详情列表
*/
@SaCheckPermission("oa:salaryItem:export")
@Log(title = "薪水详情", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OaSalaryItemBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class OaSalaryItemController extends BaseController {
*
* @param salaryItemId 主键
*/
@SaCheckPermission("oa:salaryItem:query")
@GetMapping("/{salaryItemId}")
public R<OaSalaryItemVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long salaryItemId) {
@@ -74,7 +71,6 @@ public class OaSalaryItemController extends BaseController {
/**
* 新增薪水详情
*/
@SaCheckPermission("oa:salaryItem:add")
@Log(title = "薪水详情", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,7 @@ public class OaSalaryItemController extends BaseController {
/**
* 修改薪水详情
*/
@SaCheckPermission("oa:salaryItem:edit")
@Log(title = "薪水详情", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +94,6 @@ public class OaSalaryItemController extends BaseController {
*
* @param salaryItemIds 主键串
*/
@SaCheckPermission("oa:salaryItem:remove")
@Log(title = "薪水详情", businessType = BusinessType.DELETE)
@DeleteMapping("/{salaryItemIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

9
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaCostController.java
View File

@@ -46,7 +46,6 @@ public class SysOaCostController extends BaseController {
/**
* 查询项目成本分析列表
*/
@SaCheckPermission("oa:oaCost:list")
@GetMapping("/list1")
public TableDataInfo<SysOaCostVo> list1(SysOaCostBo bo, PageQuery pageQuery) {
return iSysOaCostService.queryPageList(bo, pageQuery);
@@ -55,7 +54,6 @@ public class SysOaCostController extends BaseController {
/**
* 导出项目成本分析列表
*/
@SaCheckPermission("oa:oaCost:export")
@Log(title = "项目成本分析", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaCostBo bo, HttpServletResponse response) {
@@ -68,7 +66,6 @@ public class SysOaCostController extends BaseController {
*
* @param costId 主键
*/
@SaCheckPermission("oa:oaCost:query")
@GetMapping("/old/{costId}")
public R<SysOaCostVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long costId) {
@@ -78,7 +75,6 @@ public class SysOaCostController extends BaseController {
/**
* 新增项目成本分析
*/
@SaCheckPermission("oa:oaCost:add")
@Log(title = "项目成本分析", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -89,7 +85,6 @@ public class SysOaCostController extends BaseController {
/**
* 修改项目成本分析
*/
@SaCheckPermission("oa:oaCost:edit")
@Log(title = "项目成本分析", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -111,7 +106,6 @@ public class SysOaCostController extends BaseController {
/**
* 查询所有项目成本
*/
@SaCheckPermission("oa:oaCost:list")
@GetMapping("/list")
public TableDataInfo<SysOaCostAllVo> AllList(SysOaCostBo bo,PageQuery pageQuery) {
return iSysOaCostService.calcProjectCostList(bo,pageQuery);
@@ -123,7 +117,6 @@ public class SysOaCostController extends BaseController {
/**
* 查询详情
*/
@SaCheckPermission("oa:oaCost:query")
@GetMapping("/{projectId}")
public R<SysOaCostRow> getDetail(@NotNull(message = "项目id不能为空")
@PathVariable Long projectId) {
@@ -133,7 +126,6 @@ public class SysOaCostController extends BaseController {
/**
* 新增成本
*/
@SaCheckPermission("oa:oaCost:add")
@Log(title = "项目成本分析", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/add")
@@ -146,7 +138,6 @@ public class SysOaCostController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("oa:cost:remove")
@Log(title = "项目成本分析", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFileController.java
View File

@@ -42,7 +42,6 @@ public class SysOaFileController extends BaseController {
/**
* 查询文件存储列表
*/
@SaCheckPermission("system:oaFile:list")
@GetMapping("/list")
public TableDataInfo<SysOaFileVo> list(SysOaFileBo bo, PageQuery pageQuery) {
return iSysOaFileService.queryPageList(bo, pageQuery);
@@ -51,7 +50,6 @@ public class SysOaFileController extends BaseController {
/**
* 导出文件存储列表
*/
@SaCheckPermission("system:oaFile:export")
@Log(title = "文件存储", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaFileBo bo, HttpServletResponse response) {
@@ -64,7 +62,6 @@ public class SysOaFileController extends BaseController {
*
* @param fileId 主键
*/
@SaCheckPermission("system:oaFile:query")
@GetMapping("/{fileId}")
public R<SysOaFileVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long fileId) {
@@ -74,7 +71,6 @@ public class SysOaFileController extends BaseController {
/**
* 新增文件存储
*/
@SaCheckPermission("system:oaFile:add")
@Log(title = "文件存储", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -85,7 +81,6 @@ public class SysOaFileController extends BaseController {
/**
* 修改文件存储
*/
@SaCheckPermission("system:oaFile:edit")
@Log(title = "文件存储", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -98,7 +93,6 @@ public class SysOaFileController extends BaseController {
*
* @param fileIds 主键串
*/
@SaCheckPermission("system:oaFile:remove")
@Log(title = "文件存储", businessType = BusinessType.DELETE)
@DeleteMapping("/{fileIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

2
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProduct.java
View File

@@ -63,6 +63,6 @@ public class OaProduct extends BaseEntity {
/**
* 是否删除
*/
private Long deleted;
private Long delFlag;
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaBusinessProductBo.java
View File

@@ -25,43 +25,36 @@ public class OaBusinessProductBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long businessProductId;
/**
* 商机编号
*/
@NotNull(message = "商机编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long businessId;
/**
* 产品编号
*/
@NotNull(message = "产品编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long productId;
/**
* 产品单价
*/
@NotNull(message = "产品单价不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal productPrice;
/**
* 商机价格
*/
@NotNull(message = "商机价格不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal businessPrice;
/**
* 数量
*/
@NotNull(message = "数量不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal count;
/**
* 总计价格
*/
@NotNull(message = "总计价格不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal totalPrice;

20
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaClueBo.java
View File

@@ -26,121 +26,101 @@ public class OaClueBo extends BaseEntity {
/**
* 编号，主键自增
*/
@NotNull(message = "编号，主键自增不能为空", groups = { EditGroup.class })
private Long clueId;
/**
* 线索名称
*/
@NotBlank(message = "线索名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String clueName;
/**
* 跟进状态
*/
@NotNull(message = "跟进状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer followUpStatus;
/**
* 最后跟进时间
*/
@NotNull(message = "最后跟进时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date contactLastTime;
/**
* 最后跟进内容
*/
@NotBlank(message = "最后跟进内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String contactLastContent;
/**
* 下次联系时间
*/
@NotNull(message = "下次联系时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date contactNextTime;
/**
* 负责人的用户编号
*/
@NotNull(message = "负责人的用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long ownerUserId;
/**
* 转化状态
*/
@NotNull(message = "转化状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer transformStatus;
/**
* 客户编号
*/
@NotNull(message = "客户编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long customerId;
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空", groups = { AddGroup.class, EditGroup.class })
private String mobile;
/**
* 电话
*/
@NotBlank(message = "电话不能为空", groups = { AddGroup.class, EditGroup.class })
private String telephone;
/**
* QQ
*/
@NotBlank(message = "QQ不能为空", groups = { AddGroup.class, EditGroup.class })
private String qq;
/**
* 微信
*/
@NotBlank(message = "微信不能为空", groups = { AddGroup.class, EditGroup.class })
private String wechat;
/**
* 邮箱
*/
@NotBlank(message = "邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
private String email;
/**
* 地区编号
*/
@NotNull(message = "地区编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long areaId;
/**
* 详细地址
*/
@NotBlank(message = "详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
private String detailAddress;
/**
* 所属行业
*/
@NotNull(message = "所属行业不能为空", groups = { AddGroup.class, EditGroup.class })
private Long industryId;
/**
* 客户等级
*/
@NotNull(message = "客户等级不能为空", groups = { AddGroup.class, EditGroup.class })
private Long level;
/**
* 客户来源
*/
@NotNull(message = "客户来源不能为空", groups = { AddGroup.class, EditGroup.class })
private Long source;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;

20
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaCustomerBo.java
View File

@@ -26,121 +26,101 @@ public class OaCustomerBo extends BaseEntity {
/**
* 编号，主键自增
*/
@NotNull(message = "编号，主键自增不能为空", groups = { EditGroup.class })
private Long customerId;
/**
* 客户名称
*/
@NotBlank(message = "客户名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String name;
/**
* 跟进状态
*/
@NotNull(message = "跟进状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer followUpStatus;
/**
* 最后跟进时间
*/
@NotNull(message = "最后跟进时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date contactLastTime;
/**
* 最后跟进内容
*/
@NotBlank(message = "最后跟进内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String contactLastContent;
/**
* 下次联系时间
*/
@NotNull(message = "下次联系时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date contactNextTime;
/**
* 负责人的用户编号
*/
@NotNull(message = "负责人的用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long ownerUserId;
/**
* 成为负责人的时间
*/
@NotNull(message = "成为负责人的时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date ownerTime;
/**
* 成交状态
*/
@NotNull(message = "成交状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dealStatus;
/**
* 手机
*/
@NotBlank(message = "手机不能为空", groups = { AddGroup.class, EditGroup.class })
private String mobile;
/**
* 电话
*/
@NotBlank(message = "电话不能为空", groups = { AddGroup.class, EditGroup.class })
private String telephone;
/**
* QQ
*/
@NotBlank(message = "QQ不能为空", groups = { AddGroup.class, EditGroup.class })
private String qq;
/**
* 微信
*/
@NotBlank(message = "微信不能为空", groups = { AddGroup.class, EditGroup.class })
private String wechat;
/**
* 邮箱
*/
@NotBlank(message = "邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
private String email;
/**
* 地区编号
*/
@NotNull(message = "地区编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long areaId;
/**
* 详细地址
*/
@NotBlank(message = "详细地址不能为空", groups = { AddGroup.class, EditGroup.class })
private String detailAddress;
/**
* 所属行业
*/
@NotNull(message = "所属行业不能为空", groups = { AddGroup.class, EditGroup.class })
private Long industryId;
/**
* 客户等级
*/
@NotNull(message = "客户等级不能为空", groups = { AddGroup.class, EditGroup.class })
private Long level;
/**
* 客户来源
*/
@NotNull(message = "客户来源不能为空", groups = { AddGroup.class, EditGroup.class })
private Long source;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;

11
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaFollowUpRecordBo.java
View File

@@ -26,55 +26,48 @@ public class OaFollowUpRecordBo extends BaseEntity {
/**
* 编号
*/
@NotNull(message = "编号不能为空", groups = { EditGroup.class })
private Long followId;
/**
* 跟进类型
*/
@NotNull(message = "跟进类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long type;
/**
* 跟进内容
*/
@NotBlank(message = "跟进内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String content;
/**
* 下次联系时间
*/
@NotNull(message = "下次联系时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date nextTime;
/**
* 图片
*/
@NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
private String picUrls;
/**
* 附件
*/
@NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileUrls;
/**
* 关联的商机编号数组
*/
@NotBlank(message = "关联的商机编号数组不能为空", groups = { AddGroup.class, EditGroup.class })
private String businessIds;
/**
* 暂用此代替商机记录
*/
@NotNull(message = "暂用此代替商机记录不能为空", groups = { AddGroup.class, EditGroup.class })
private Long businessId;
/**
* 关联的联系人编号数组
*/
@NotBlank(message = "关联的联系人编号数组不能为空", groups = { AddGroup.class, EditGroup.class })
private String contactIds;

11
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProductBo.java
View File

@@ -25,7 +25,6 @@ public class OaProductBo extends BaseEntity {
/**
* 产品编号
*/
@NotNull(message = "产品编号不能为空", groups = { EditGroup.class })
private Long productId;
/**
@@ -43,44 +42,38 @@ public class OaProductBo extends BaseEntity {
/**
* 单位
*/
@NotNull(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
private Long unit;
/**
* 价格，单位：元
*/
@NotNull(message = "价格，单位：元不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal price;
/**
* 状态
*/
@NotNull(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Long status;
/**
* 产品分类编号
*/
@NotNull(message = "产品分类编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long categoryId;
/**
* 产品描述
*/
@NotBlank(message = "产品描述不能为空", groups = { AddGroup.class, EditGroup.class })
private String description;
/**
* 负责人的用户编号
*/
@NotNull(message = "负责人的用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long ownerUserId;
/**
* 是否删除
*/
@NotNull(message = "是否删除不能为空", groups = { AddGroup.class, EditGroup.class })
private Long deleted;
private Long delFlag;
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaClueVo.java
View File

@@ -143,5 +143,6 @@ public class OaClueVo {
@ExcelProperty(value = "备注")
private String remark;
private String nickName;
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaCustomerVo.java
View File

@@ -144,4 +144,11 @@ public class OaCustomerVo {
private String remark;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String nickName;
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProductVo.java
View File

@@ -73,14 +73,7 @@ public class OaProductVo {
/**
* 负责人的用户编号
*/
@ExcelProperty(value = "负责人的用户编号")
private Long ownerUserId;
/**
* 是否删除
*/
@ExcelProperty(value = "是否删除")
private Long deleted;
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaClueMapper.java
View File

@@ -1,8 +1,12 @@
package com.ruoyi.oa.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.oa.domain.OaClue;
import com.ruoyi.oa.domain.vo.OaClueVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* CRM 线索Mapper接口
@@ -12,4 +16,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
*/
public interface OaClueMapper extends BaseMapperPlus<OaClueMapper, OaClue, OaClueVo> {
Page<OaClueVo> selectVoListPage(Page<Object> build,@Param(Constants.WRAPPER) LambdaQueryWrapper<OaClue> lqw);
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaCustomerMapper.java
View File

@@ -1,8 +1,13 @@
package com.ruoyi.oa.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.oa.domain.OaCustomer;
import com.ruoyi.oa.domain.vo.OaCustomerVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
/**
* CRM 客户Mapper接口
@@ -12,4 +17,6 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
*/
public interface OaCustomerMapper extends BaseMapperPlus<OaCustomerMapper, OaCustomer, OaCustomerVo> {
Page<OaCustomerVo> selectVoPageToUser(Page<Object> build,@Param(Constants.WRAPPER) Wrapper<OaCustomer> lqw);
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaBusinessService.java
View File

@@ -5,6 +5,7 @@ import com.ruoyi.oa.domain.vo.OaBusinessVo;
import com.ruoyi.oa.domain.bo.OaBusinessBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.oa.domain.vo.OaFollowUpRecordVo;
import com.ruoyi.oa.domain.vo.OaProductVo;
import java.util.Collection;
@@ -53,4 +54,5 @@ public interface IOaBusinessService {
* 联查商机与产品以及其关联表
*/
TableDataInfo<OaProductVo> getBusinessProducts(OaBusinessBo bo);
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaClueService.java
View File

@@ -46,4 +46,12 @@ public interface IOaClueService {
* 校验并批量删除CRM 线索信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 查询使用xml 关联到user表
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<OaClueVo> queryPageListVo(OaClueBo bo, PageQuery pageQuery);
}

16
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaCustomerService.java
View File

@@ -46,4 +46,20 @@ public interface IOaCustomerService {
* 校验并批量删除CRM 客户信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 查询已分配的用户
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<OaCustomerVo> queryPageListToUser(OaCustomerBo bo, PageQuery pageQuery);
/**
* 查询公海中的客户
* @param bo
* @param pageQuery
* @return
*/
TableDataInfo<OaCustomerVo> queryPageListToSea(OaCustomerBo bo, PageQuery pageQuery);
}

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaFollowUpRecordService.java
View File

@@ -46,4 +46,6 @@ public interface IOaFollowUpRecordService {
* 校验并批量删除CRM 跟进记录信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<OaFollowUpRecordVo> selectByBusinessIds(Collection<Long> list);
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/EmployeeFilesServiceImpl.java
View File

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.domain.vo.FileUser;
import com.ruoyi.oa.domain.vo.UserFilesVo;
import com.ruoyi.system.service.ISysUserService;
import liquibase.pro.packaged.A;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

4
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaBusinessServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.domain.vo.OaFollowUpRecordVo;
import com.ruoyi.oa.domain.vo.OaProductVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -17,6 +18,7 @@ import com.ruoyi.oa.domain.OaBusiness;
import com.ruoyi.oa.mapper.OaBusinessMapper;
import com.ruoyi.oa.service.IOaBusinessService;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@@ -128,7 +130,7 @@ public class OaBusinessServiceImpl implements IOaBusinessService {
@Override
public TableDataInfo<OaProductVo> getBusinessProducts(OaBusinessBo bo) {
QueryWrapper<OaBusiness> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(bo.getBusinessId() != null,"oa_business.business_id", bo.getBusinessId());
queryWrapper.eq(bo.getBusinessId() != null,"ob.business_id", bo.getBusinessId());
return TableDataInfo.build(baseMapper.getBusinessProducts(bo,queryWrapper));
}
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaClueServiceImpl.java
View File

@@ -123,4 +123,11 @@ public class OaClueServiceImpl implements IOaClueService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public TableDataInfo<OaClueVo> queryPageListVo(OaClueBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaClue> lqw = buildQueryWrapper(bo);
Page<OaClueVo> result = baseMapper.selectVoListPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
}

28
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaCustomerServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
@@ -66,19 +67,8 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
lqw.eq(bo.getContactLastTime() != null, OaCustomer::getContactLastTime, bo.getContactLastTime());
lqw.eq(StringUtils.isNotBlank(bo.getContactLastContent()), OaCustomer::getContactLastContent, bo.getContactLastContent());
lqw.eq(bo.getContactNextTime() != null, OaCustomer::getContactNextTime, bo.getContactNextTime());
lqw.eq(bo.getOwnerUserId() != null, OaCustomer::getOwnerUserId, bo.getOwnerUserId());
lqw.eq(bo.getOwnerTime() != null, OaCustomer::getOwnerTime, bo.getOwnerTime());
lqw.eq(bo.getDealStatus() != null, OaCustomer::getDealStatus, bo.getDealStatus());
lqw.eq(StringUtils.isNotBlank(bo.getMobile()), OaCustomer::getMobile, bo.getMobile());
lqw.eq(StringUtils.isNotBlank(bo.getTelephone()), OaCustomer::getTelephone, bo.getTelephone());
lqw.eq(StringUtils.isNotBlank(bo.getQq()), OaCustomer::getQq, bo.getQq());
lqw.eq(StringUtils.isNotBlank(bo.getWechat()), OaCustomer::getWechat, bo.getWechat());
lqw.eq(StringUtils.isNotBlank(bo.getEmail()), OaCustomer::getEmail, bo.getEmail());
lqw.eq(bo.getAreaId() != null, OaCustomer::getAreaId, bo.getAreaId());
lqw.like(StringUtils.isNotBlank(bo.getDetailAddress()), OaCustomer::getDetailAddress, bo.getDetailAddress());
lqw.eq(bo.getIndustryId() != null, OaCustomer::getIndustryId, bo.getIndustryId());
lqw.eq(bo.getLevel() != null, OaCustomer::getLevel, bo.getLevel());
lqw.eq(bo.getSource() != null, OaCustomer::getSource, bo.getSource());
return lqw;
}
@@ -123,4 +113,20 @@ public class OaCustomerServiceImpl implements IOaCustomerService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public TableDataInfo<OaCustomerVo> queryPageListToUser(OaCustomerBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
lqw.eq(OaCustomer::getOwnerUserId, LoginHelper.getUserId());
Page<OaCustomerVo> result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public TableDataInfo<OaCustomerVo> queryPageListToSea(OaCustomerBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaCustomer> lqw = buildQueryWrapper(bo);
lqw.isNull(OaCustomer::getOwnerUserId);
Page<OaCustomerVo> result = baseMapper.selectVoPageToUser(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
}

14
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFollowUpRecordServiceImpl.java
View File

@@ -15,6 +15,7 @@ import com.ruoyi.oa.domain.OaFollowUpRecord;
import com.ruoyi.oa.mapper.OaFollowUpRecordMapper;
import com.ruoyi.oa.service.IOaFollowUpRecordService;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@@ -113,4 +114,17 @@ public class OaFollowUpRecordServiceImpl implements IOaFollowUpRecordService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public List<OaFollowUpRecordVo> selectByBusinessIds(Collection<Long> businessIds) {
LambdaQueryWrapper<OaFollowUpRecord> queryWrapper = new LambdaQueryWrapper<>();
// 将多个业务id用 or 拼接
for (Long id : businessIds) {
queryWrapper.or().apply("FIND_IN_SET({0}, business_ids)", id);
}
return baseMapper.selectVoList(queryWrapper);
}
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaProductServiceImpl.java
View File

@@ -69,7 +69,6 @@ public class OaProductServiceImpl implements IOaProductService {
lqw.eq(bo.getCategoryId() != null, OaProduct::getCategoryId, bo.getCategoryId());
lqw.like(StringUtils.isNotBlank(bo.getDescription()), OaProduct::getDescription, bo.getDescription());
lqw.eq(bo.getOwnerUserId() != null, OaProduct::getOwnerUserId, bo.getOwnerUserId());
lqw.eq(bo.getDeleted() != null, OaProduct::getDeleted, bo.getDeleted());
return lqw;
}

2
ruoyi-oa/src/main/resources/mapper/oa/OaBusinessMapper.xml
View File

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getBusinessProducts" resultType="com.ruoyi.oa.domain.vo.OaProductVo">
select op.product_id, op.product_name, op.product_number, op.unit, op.price, op.status, op.category_id, op.description, op.deleted
select op.product_id, op.product_name, op.product_number, op.unit, op.price, op.status, op.category_id, op.description, op.del_flag
from oa_business ob
left join oa_business_product obp on ob.business_id = obp.business_id
left join oa_product op on obp.product_id = op.product_id

9
ruoyi-oa/src/main/resources/mapper/oa/OaClueMapper.xml
View File

@@ -33,4 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectVoListPage" resultType="com.ruoyi.oa.domain.vo.OaClueVo">
select oc.clue_id,oc.clue_id, oc.clue_name, oc.follow_up_status, oc.contact_last_time, oc.contact_last_content, oc.contact_next_time, oc.owner_user_id, oc.transform_status, oc.customer_id, oc.mobile, oc.telephone, oc.qq, oc.wechat, oc.email, oc.area_id, oc.detail_address, oc.industry_id, oc.level, oc.source, oc.remark, oc.create_by, oc.create_time, oc.update_by, oc.update_time, oc.del_flag
,nick_name
from oa_clue oc
left join sys_user su on su.user_id = oc.owner_user_id
${ew.getCustomSqlSegment}
</select>
</mapper>

7
ruoyi-oa/src/main/resources/mapper/oa/OaCustomerMapper.xml
View File

@@ -33,4 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectVoPageToUser" resultType="com.ruoyi.oa.domain.vo.OaCustomerVo">
select oc.customer_id, nick_name,name, follow_up_status, contact_last_time, contact_last_content, contact_next_time, owner_user_id, owner_time, deal_status, mobile, telephone, qq, wechat, oc.email, area_id, detail_address, industry_id, level, source, oc.remark,oc.create_by, oc.create_time, oc.update_by, oc.update_time, oc.del_flag from oa_customer oc
left join fad_oa.sys_user su on oc.owner_user_id = su.user_id
${ew.getCustomSqlSegment}
</select>
</mapper>

2
ruoyi-oa/src/main/resources/mapper/oa/OaProductMapper.xml
View File

@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="deleted" column="deleted"/>
<result property="delFlag" column="del_flag"/>
</resultMap>

8
ruoyi-oa/src/main/resources/mapper/oa/OaSalaryMapper.xml
View File

@@ -34,8 +34,7 @@
os.pay_time,
os.base_salary,
(
os.base_salary * DAY(LAST_DAY(#{payTime}))
+ COALESCE(SUM(
COALESCE(SUM(
CASE
WHEN osi.flag = 1 THEN osi.price
WHEN osi.flag = 0 THEN -osi.price
@@ -80,14 +79,13 @@
os.pay_time,
os.base_salary,
(
os.base_salary * DAY(LAST_DAY(#{payTime}))
DAY(LAST_DAY(#{payTime}))
+ COALESCE(SUM(
CASE
WHEN osi.flag = 1 THEN osi.price
WHEN osi.flag = 0 THEN -osi.price
ELSE 0
END
), 0)
END), 0)
) AS real_salary,
osi.salary_item_id,
osi.reason,