完成截止12.26测试出来的问题

zss

2024-12-26 0e96251ba40dec171d92f99a2ec482f692bdf1ab

 cnas-process/src/main/java/com/yuanchu/mom/service/impl/QualitySuperviseServiceImpl.java

@@ -17,6 +17,7 @@
import com.yuanchu.mom.dto.QualitySuperviseDetailsAccordingDto;
import com.yuanchu.mom.dto.QualitySuperviseDetailsCorrectDto;
import com.yuanchu.mom.dto.QualitySuperviseDetailsDto;
import com.yuanchu.mom.dto.QualitySuperviseDto;
import com.yuanchu.mom.excel.QualitySuperviseDetailsUpload;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
@@ -114,8 +115,7 @@
                            StringUtils.isNotBlank(detailsUpload.getSupervisePurpose()) &&
                            StringUtils.isNotBlank(detailsUpload.getSuperviseProject()) &&
                            StringUtils.isNotBlank(detailsUpload.getSupervisee()) &&
                            StringUtils.isNotBlank(detailsUpload.getSuperviseReason()) &&
                            StringUtils.isNotBlank(detailsUpload.getRemark())) {
                            StringUtils.isNotBlank(detailsUpload.getSuperviseReason())) {
                        // 对象复制
                        QualitySuperviseDetails superviseDetails = new QualitySuperviseDetails();
                        BeanUtils.copyProperties(detailsUpload, superviseDetails);
@@ -146,9 +146,11 @@
    public boolean ratifyQualitySupervise(QualitySupervise qualitySupervise) {
        // 当前登录用户
        Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
        User user = userMapper.selectById(userId);
        baseMapper.update(null, Wrappers.<QualitySupervise>lambdaUpdate()
                .eq(QualitySupervise::getSuperviseId, qualitySupervise.getSuperviseId())
                .set(QualitySupervise::getRatifyUserId, userId)
                .set(QualitySupervise::getRatifyUserName, user.getName())
                .set(QualitySupervise::getRatifyRemark, qualitySupervise.getRatifyRemark())
                .set(QualitySupervise::getRatifyStatus, qualitySupervise.getRatifyStatus())
                .set(QualitySupervise::getRatifyTime, LocalDateTime.now())
@@ -163,7 +165,7 @@
     * @return
     */
    @Override
    public IPage<QualitySupervise> pageQualitySupervise(Page page, QualitySupervise qualitySupervise) {
    public IPage<QualitySuperviseDto> pageQualitySupervise(Page page, QualitySupervise qualitySupervise) {
        return baseMapper.pageQualitySupervise(page, QueryWrappers.queryWrappers(qualitySupervise));
    }