From 90e1a1ff7a90be36af8940a4695fe201a763de05 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 18 May 2026 15:59:00 +0800 Subject: [PATCH] =?UTF-8?q?1.1.42=20=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8B=E6=8B=89=E6=A1=86=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CrmCustomerInfoController.java | 2 +- .../crm/service/ICrmCustomerInfoService.java | 7 +++++++ .../impl/CrmCustomerInfoServiceImpl.java | 21 +++++++++++++++---- .../impl/ErpContractInfoServiceImpl.java | 4 ++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmCustomerInfoController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmCustomerInfoController.java index 0bada8c7..e7234a69 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmCustomerInfoController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/controller/CrmCustomerInfoController.java @@ -109,7 +109,7 @@ public class CrmCustomerInfoController extends BaseController { */ @GetMapping("/getCrmCustomerInfoList") public R> getCrmCustomerInfoList(CrmCustomerInfoBo bo) { - List list = crmCustomerInfoService.queryList(bo); + List list = crmCustomerInfoService.getCrmCustomerInfoList(bo); return R.ok(list); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmCustomerInfoService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmCustomerInfoService.java index e5e6b4b5..bfc69367 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmCustomerInfoService.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/ICrmCustomerInfoService.java @@ -66,4 +66,11 @@ public interface ICrmCustomerInfoService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 下拉框查询客户信息列表 + * @param bo + * @return + */ + List getCrmCustomerInfoList(CrmCustomerInfoBo bo); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java index ed24d852..732e207c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmCustomerInfoServiceImpl.java @@ -100,7 +100,7 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService { */ @Override public TableDataInfo queryPageList(CrmCustomerInfoBo bo, PageQuery pageQuery) { - MPJLambdaWrapper lqw = buildQueryWrapper(bo); + MPJLambdaWrapper lqw = buildQueryWrapper(bo, false); Page result = baseMapper.selectCustomCrmCustomerInfoVoList(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -113,11 +113,11 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService { */ @Override public List queryList(CrmCustomerInfoBo bo) { - MPJLambdaWrapper lqw = buildQueryWrapper(bo); + MPJLambdaWrapper lqw = buildQueryWrapper(bo, false); return baseMapper.selectCustomCrmCustomerInfoVoList(lqw); } - private MPJLambdaWrapper buildQueryWrapper(CrmCustomerInfoBo bo) { + private MPJLambdaWrapper buildQueryWrapper(CrmCustomerInfoBo bo, boolean isAllData) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(CrmCustomerInfo.class) .selectAll(CrmCustomerInfo.class) @@ -142,7 +142,9 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService { .eq(StringUtils.isNotBlank(bo.getOurCompanyFlag()), CrmCustomerInfo::getOurCompanyFlag, bo.getOurCompanyFlag()) .eq(bo.getParentCustomerId() != null, CrmCustomerInfo::getParentCustomerId, bo.getParentCustomerId()) .eq("t.del_flag", "0"); - applyCustomerDataScope(lqw); + if (!isAllData){ + applyCustomerDataScope(lqw); + } return lqw; } @@ -212,4 +214,15 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService { } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 下拉框查询客户信息列表 + * @param bo + * @return + */ + @Override + public List getCrmCustomerInfoList(CrmCustomerInfoBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo, true); + return baseMapper.selectCustomCrmCustomerInfoVoList(lqw); + } } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java index 032631fc..6732d40a 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java @@ -530,7 +530,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { data.put("合同编号", strVal(contractInfo.getContractCode())); data.put("合同名称", strVal(contractInfo.getContractName())); data.put("客户合同编号", strVal(contractInfo.getCustomerContractCode())); - data.put("合同签订日期", formatWordDate(contractInfo.getContractDate())); + data.put("导出日期", formatWordDate(new Date())); data.put("合同金额", contractInfo.getTotalPrice() == null ? "" : contractInfo.getTotalPrice().toPlainString()); data.put("甲方公司", strVal(contractInfo.getOneCustomerName())); data.put("乙方公司", strVal(contractInfo.getTwoCustomerName())); @@ -609,7 +609,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { } data.put(keyPrefix + "审批人", resolveApproveName(task)); - data.put(keyPrefix + "审批意见", strVal(task.get("message"))); + data.put(keyPrefix + "审批意见", StringUtils.isEmpty(strVal(task.get("message"))) ? "同意" : strVal(task.get("message"))); data.put(keyPrefix + "审批时间", formatWordDate(parseDate(task.get("updateTime")))); }