|
@@ -30,10 +30,12 @@ import com.fjhx.sale.service.ext.ExtQuotationFollowService;
|
|
|
import com.fjhx.sale.service.ext.ExtQuotationProductBomService;
|
|
|
import com.fjhx.sale.service.ext.ExtQuotationProductService;
|
|
|
import com.fjhx.sale.service.ext.ExtQuotationService;
|
|
|
+import com.ruoyi.common.core.domain.BasePo;
|
|
|
import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
+import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -84,7 +86,7 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
|
|
|
wrapper.ge("eq", ExtQuotation::getCreateTime, dto.getBeginTime());
|
|
|
wrapper.le("eq", ExtQuotation::getCreateTime, dto.getEndTime());
|
|
|
|
|
|
- wrapper.ne("eq", ExtQuotation::getStatus, FlowStatusEnum1.UPDATE);
|
|
|
+ wrapper.ne("eq", ExtQuotation::getStatus, FlowStatusEnum1.UPDATE.getKey());
|
|
|
wrapper.eq("eq", ExtQuotation::getStatus, dto.getStatus());
|
|
|
|
|
|
Page<ExtQuotationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
@@ -94,6 +96,9 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
|
|
|
return page;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ UserUtil.assignmentNickName(records, BasePo::getCreateUser, ExtQuotationVo::setUserName);
|
|
|
+
|
|
|
|
|
|
customerService.attributeAssign(records, ExtQuotationVo::getBuyCorporationId, (item, customer) -> {
|
|
|
item.setBuyCorporationName(customer.getName());
|