浏览代码

问题处理

yzc 1 年之前
父节点
当前提交
f43374c270

+ 4 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -119,6 +119,10 @@ public class SaleQuotationVo extends SaleQuotation {
      * 归属公司名称
      */
     private String ofCompanyName;
+    /**
+     * 归属部门名称
+     */
+    private String ofDeptName;
 
 
     /**

+ 1 - 0
hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -258,6 +258,7 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
             quotationProductService.update(q -> q
                     .eq(QuotationProduct::getId, extQuotationProductDto.getQuotationProductId())
                     .set(QuotationProduct::getPrice, extQuotationProductDto.getPrice())
+                    .set(QuotationProduct::getAmount, extQuotationProductDto.getAmount())
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
                     .set(BasePo::getUpdateTime, new Date())
             );

+ 5 - 4
hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -56,6 +56,7 @@ import com.fjhx.socket.core.PushTypeEnum;
 import com.fjhx.socket.core.WebSocketPush;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
+import com.fjhx.tenant.utils.DeptUstil;
 import com.fjhx.tenant.utils.DictUtils;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -379,10 +380,10 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         }
 
         //获取归属公司信息
-        SysDept sysDept = sysDeptService.getById(result.getCompanyId());
-        if (ObjectUtil.isNotEmpty(sysDept)) {
-            result.setCompanyName(sysDept.getDeptName());
-        }
+        Map<Long, String> deptNameMap = DeptUstil.getDeptNameMap();
+        result.setCompanyName(deptNameMap.get(result.getCompanyId()));
+        result.setOfCompanyName(deptNameMap.get(result.getOfCompanyId()));
+        result.setOfDeptName(deptNameMap.get(result.getOfDeptId()));
 
         return setDetailInfo(Arrays.asList(result)).get(0);
     }