1.1.42 查询客户信息下拉框全量查询

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<List<CrmCustomerInfoVo>> getCrmCustomerInfoList(CrmCustomerInfoBo bo) {
-        List<CrmCustomerInfoVo> list = crmCustomerInfoService.queryList(bo);
+        List<CrmCustomerInfoVo> list = crmCustomerInfoService.getCrmCustomerInfoList(bo);
         return R.ok(list);
     }
 

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<Long> ids, Boolean isValid);
+
+    /**
+     * 下拉框查询客户信息列表
+     * @param bo
+     * @return
+     */
+    List<CrmCustomerInfoVo> getCrmCustomerInfoList(CrmCustomerInfoBo bo);
 }

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<CrmCustomerInfoVo> queryPageList(CrmCustomerInfoBo bo, PageQuery pageQuery) {
-        MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo);
+        MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo, false);
         Page<CrmCustomerInfoVo> result = baseMapper.selectCustomCrmCustomerInfoVoList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -113,11 +113,11 @@ public class CrmCustomerInfoServiceImpl implements ICrmCustomerInfoService {
      */
     @Override
     public List<CrmCustomerInfoVo> queryList(CrmCustomerInfoBo bo) {
-        MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo);
+        MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo, false);
         return baseMapper.selectCustomCrmCustomerInfoVoList(lqw);
     }
 
-    private MPJLambdaWrapper<CrmCustomerInfo> buildQueryWrapper(CrmCustomerInfoBo bo) {
+    private MPJLambdaWrapper<CrmCustomerInfo> buildQueryWrapper(CrmCustomerInfoBo bo, boolean isAllData) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<CrmCustomerInfo> 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<CrmCustomerInfoVo> getCrmCustomerInfoList(CrmCustomerInfoBo bo) {
+        MPJLambdaWrapper<CrmCustomerInfo> lqw = buildQueryWrapper(bo, true);
+        return baseMapper.selectCustomCrmCustomerInfoVoList(lqw);
+    }
 }

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"))));
     }