代码迁移bug解决

chenrui

2025-03-07 0f44078d297adcbaee7c9a16b4f4d3257d858491

代码迁移bug解决

 basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java

@@ -34,8 +34,12 @@
    //添加资质明细列表
    @Override
    public int addCertificationDetail(Certification certification) {
        if(null != certification.getId()){
            return certificationMapper.updateById(certification);
        }else {
        return certificationMapper.insert(certification);
    }
    }

    //删除资质明细列表
    @Override

 basic-server/src/main/resources/mapper/CertificationMapper.xml

@@ -3,7 +3,8 @@
<mapper namespace="com.ruoyi.basic.mapper.CertificationMapper">
    <select id="getCertificationDetail" resultType="com.ruoyi.basic.pojo.Certification">
        select b.*
        from ( select a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time FROM
        from ( select c.id,a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time ,    c.image_url,
        c.file_url FROM
            (SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
                    MAX(date_of_issuance) AS latest_issuance_date,
                    c.`code`,c.organization,c.explanation

 basic-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -329,6 +329,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        ORDER BY declare_date DESC
    </select>
    <select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
        SELECT * from ifs_inventory_quantity ifs

 cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java

@@ -59,8 +59,8 @@
    }

    @ApiOperation(value = "导出检验报告发放登记表")
    @PostMapping("/exportProcessReport")
    public Result exportProcessReport(@RequestBody ProcessReportDto processReportDto) {
    @GetMapping("/exportProcessReport")
    public Result exportProcessReport(ProcessReportDto processReportDto) {
        return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
    }


 cnas-process/src/main/java/com/ruoyi/process/controller/QualityMonitorController.java

@@ -262,7 +262,7 @@
     * @return
     */
    @ApiOperation(value = "删除监控评价附件表")
    @GetMapping("/delVerifyEvaluateFileList")
    @DeleteMapping("/delVerifyEvaluateFileList")
    public Result delVerifyMethodFileList(Integer evaluateFileId) {
        return Result.success(qualityMonitorDetailsEvaluateFileMapper.deleteById(evaluateFileId));
    }

 cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java

@@ -57,7 +57,9 @@
            String currentMonth = currentDate.format(formatter);
            //查询历史
            ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth, currentMonth));
            if(ObjectUtils.isNotEmpty(processTotaldeal)){
            processDeal.setTotaldealId(processTotaldeal.getId());
            }
        }

        return processDealMapper.pageProcessDeal(page, QueryWrappers.queryWrappers(processDeal));
@@ -73,7 +75,9 @@
            // 格式化当前日期
            String currentMonth = dealTime.format(formatter);
            processTotaldeal= processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth,currentMonth));
            if(ObjectUtils.isNotEmpty(processTotaldeal)){
            processDeal.setTotaldealId(processTotaldeal.getId());
            }
        }else {
            processTotaldeal= processTotaldealMapper.selectById(processDeal.getTotaldealId());
        }
@@ -95,10 +99,13 @@
    public int doProcessDeal(ProcessDeal processDeal) {
        if (ObjectUtils.isNotEmpty(processDeal.getNum())) {
            ProcessDeal oldProcessDeal = processDealMapper.selectById(processDeal.getId());
            if(null != processDeal.getTotaldealId()){
            ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
            processTotaldeal.setTotalNum(processTotaldeal.getTotalNum() - oldProcessDeal.getNum() + processDeal.getNum());
                int totalNum = ObjectUtils.isEmpty(processTotaldeal) ? 0 : processTotaldeal.getTotalNum();
                processTotaldeal.setTotalNum(totalNum - oldProcessDeal.getNum() + processDeal.getNum());
            processTotaldealMapper.updateById(processTotaldeal);
        }
        }
        return processDealMapper.updateById(processDeal);
    }
}

 cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java

@@ -81,7 +81,6 @@
    @GetMapping("/exportFeStandardSubstanceAcceptance")
    public Result exportFeStandardSubstanceAcceptance(HttpServletResponse response) {
        feStandardSubstanceAcceptanceService.exportFeStandardSubstanceAcceptance(response);

        return Result.success();
    }


 cnas-require/src/main/java/com/ruoyi/require/pojo/FeStandardSubstanceAcceptance.java

@@ -1,5 +1,6 @@
package com.ruoyi.require.pojo;

import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
@@ -72,15 +73,19 @@
    @ExcelProperty("附件")
    private String file;

    @ExcelIgnore
    @TableField(fill = FieldFill.INSERT)
    private String createUser;

    @ExcelIgnore
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ExcelIgnore
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private String updateUser;

    @ExcelIgnore
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;
}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java

@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.inspect.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -85,7 +86,7 @@
    @ApiModelProperty("子实验室")
    private String sonLaboratory;


    private String sampleStr;




 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java

@@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDate;
@@ -85,7 +86,8 @@

    @ApiModelProperty("下单时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty("下发时间")

 inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml

@@ -9,7 +9,7 @@
                         when
                             io.type_source = 0
                             then io.sample_view
                         else io.sample end                            sample,
                         else io.sample end                            sampleStr,
                     GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
              from ins_order io
                       LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id

 inspect-server/src/main/resources/mapper/InsReportMapper.xml

@@ -54,6 +54,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        ORDER BY a.create_time DESC
    </select>
    <select id="getLaboratoryByName" resultType="java.lang.String">
        select s.address from seal s

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -250,6 +250,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        ORDER BY A.ins_time DESC
    </select>

    <select id="inspectionOrderDetailsTaskSwitching" resultType="com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo">