refactor(production): 优化工艺路线实体映射和查询逻辑

liyong

12 小时以前 191a4bb404614a3952147f1cb65f4451f182b045

refactor(production): 优化工艺路线实体映射和查询逻辑

 src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java

@@ -7,11 +7,10 @@
@Data
public class ProcessRouteDto extends ProcessRoute {

    @ApiModelProperty(value = "生产炒机")
    private String speculativeTradingName;

    private Long productId;

    private String productName;

    @ApiModelProperty("规格")
    private String model;
}

 src/main/java/com/ruoyi/production/pojo/ProcessRoute.java

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

@TableName("process_route")
@Data
public class ProcessRoute {


 src/main/resources/mapper/production/ProcessRouteMapper.xml

@@ -13,9 +13,10 @@
    </resultMap>

    <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
        select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
        select ps.*, p.product_name,pm.product_id,pm.model
        from process_route ps
                 left join product_model pm on ps.product_model_id = pm.id
        left join product_model pm on ps.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        <where>
            <if test="c.model != null and c.model != ''">
                and pm.model like concat('%',#{c.model},'%')