feat(staff): 支持默认密码设置并完善用户信息关联

buhuazhen

2 天以前 1d68d2eec415e5f4ef508033ded1dbead1d300ae

 src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,9 +18,11 @@
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.mapper.SalesQuotationFileMapper;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.SalesQuotationFile;
import com.ruoyi.sales.pojo.SalesQuotationProduct;
import com.ruoyi.sales.service.SalesQuotationProductService;
import com.ruoyi.sales.service.SalesQuotationService;
@@ -45,6 +48,9 @@

    @Autowired
    private ApproveProcessServiceImpl approveProcessService;
    @Autowired
    private SalesQuotationFileMapper salesQuotationFileMapper;

    @Override
    public IPage<SalesQuotationDto> listPage(Page page, SalesQuotationDto salesQuotationDto) {
        IPage<SalesQuotationDto> salesQuotationDtoIPage = salesQuotationMapper.listPage(page, salesQuotationDto);
@@ -54,6 +60,7 @@
        salesQuotationDtoIPage.getRecords().forEach(record -> {
            List<SalesQuotationProduct> products = salesQuotationProductMapper.selectBySalesQuotationId(record.getId());
            record.setProducts(products);
            record.setFiles(salesQuotationFileMapper.selectList(new QueryWrapper<SalesQuotationFile>().lambda().eq(SalesQuotationFile::getSalesQuotationId, record.getId())));
        });
        return salesQuotationDtoIPage;
    }
@@ -92,6 +99,10 @@
            log.error("SalesQuotationServiceImpl error:{}", e);
            throw new RuntimeException("审批失败");
        }
        for (SalesQuotationFile file : salesQuotationDto.getFiles()) {
            file.setSalesQuotationId(salesQuotation.getId());
            salesQuotationFileMapper.insert(file);
        }
        return true;
    }
    @Override
@@ -123,6 +134,12 @@
        vo.setApproveType(6);
        vo.setApproveReason(salesQuotationDto.getQuotationNo());
        approveProcessService.updateApproveUser(vo);
        for (SalesQuotationFile file : salesQuotationDto.getFiles()) {
            if (file.getId() == null) {
                file.setSalesQuotationId(salesQuotation.getId());
                salesQuotationFileMapper.insert(file);
            }
        }
        return true;
    }
    @Override