问题处理

hx-customer/src/main/java/com/fjhx/customer/mapper/customer/CustomerMapper.java

@@ -1,11 +1,10 @@
 package com.fjhx.customer.mapper.customer;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fjhx.customer.entity.customer.dto.CustomerDto;
-import com.fjhx.customer.entity.customer.po.Customer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.customer.entity.customer.dto.CustomerDto;
+import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.entity.customer.vo.CustomerFollowRecordsVo;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -58,4 +57,6 @@ public interface CustomerMapper extends BaseMapper<Customer> {
      * 跟进记录获取
      */
     List<CustomerFollowRecordsVo> getFollowUp(@Param("id") Long id, @Param("tenantId") String tenantId);
+
+    CustomerVo detail(Long id);
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -241,8 +241,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Override
     public CustomerVo detail(Long id) {
         //查询客户表的信息
-        Customer Customer = this.getById(id);
-        CustomerVo result = BeanUtil.toBean(Customer, CustomerVo.class);
+        CustomerVo result = baseMapper.detail(id);
         if (ObjectUtil.isEmpty(result)) {
             throw new ServiceException("没有找到该用户信息");
         }

hx-customer/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -51,11 +51,11 @@
                c.priv_account_name,
                c.priv_account_bank,
                c.priv_account_number,
-               t1.followCount,
+               IFNULL(t1.followCount, 0)    AS followCount,
                t1.lastSaleDate,
-               t1.lastSaleDay,
-               t1.orderCount,
-               t1.orderAmountSum
+               IFNULL(t1.lastSaleDay, 0)    as lastSaleDay,
+               IFNULL(t1.orderCount, 0)     as orderCount,
+               IFNULL(t1.orderAmountSum, 0) as orderAmountSum
         from customer c
                  LEFT JOIN (SELECT c.id,
                                    count(cfr.id)                                 AS followCount,
@@ -138,5 +138,9 @@
                WHERE cfr.customer_id = #{id})) t1
         ORDER BY t1.date DESC LIMIT 3
     </select>
+    <select id="detail" resultType="com.fjhx.customer.entity.customer.vo.CustomerVo">
+        <include refid="listOrPage"/>
+        WHERE c.id = #{id}
+    </select>
 
 </mapper>

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -3,7 +3,6 @@ package com.fjhx.sale.flow;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
@@ -58,7 +57,7 @@ public class ContractFlow extends FlowDelegate {
         if (StringUtils.isEmpty(contract.getCurrency())) {
             throw new ServiceException("币种不能为空");
         }
-        contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
+//        contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
 
         // 保存合同产品
         List<ContractProductDto> contractProductList = contract.getContractProductList();

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -29,8 +29,10 @@ import com.fjhx.common.entity.claim.ClaimContract;
 import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
+import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.enums.PushBusinessTypeEnum;
+import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.contract.ContractTemplateService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
@@ -221,6 +223,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private ContractOutboundRecordsService contractOutboundRecordsService;
     @Autowired
     private SaleService saleService;
+    @Autowired
+    private CodingRuleService codingRuleService;
 
     /**
      * 合同和样品单 下拉分页
@@ -1342,6 +1346,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
     @Override
     public void saveOrEdit(ContractDto contract) {
+        if (ObjectUtil.isEmpty(contract.getCode())) {
+            contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
+        }
+
 //        //生产公司信息校验
 //        Assert.notEmpty(contract.getCompanyId(), "生产公司id不能为空！");
 //        //销售部门id