增加首页搜索接口参数调整

yangys

2025-08-22 43b6b4b905fb272e2d7d9c0738610c4204c958ce

增加首页搜索接口参数调整

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml

@@ -117,20 +117,26 @@
        left join blade_dict_biz dt on n.node_type=dt.dict_key and dt.code='nc_node_type' and dt.is_deleted=0
        <where>
            n.is_deleted=0 and n.node_type='20' and n.name=#{drawingNo}
            <if test="programStatus != null and programStatus != ''">
            <if test="status != null and status != ''">
               and
                (
                <if test='programStatus.contains("1")'>
                <if test='status.contains("1")'>
                    n.parent_ids LIKE '0,1,%'
                </if>
                <if test='programStatus.contains("2")'>
                <if test='status.contains("2")'>
                    or n.parent_ids LIKE '0,2,%'
                </if>
                <if test='programStatus.contains("2")'>
                <if test='status.contains("2")'>
                    or n.parent_ids LIKE '0,3,%'
                </if>
                )
            </if>
            <if test="createTimeBegin != null">
                n.create_time&gt;=#{createTimeBegin}
            </if>
            <if test="createTimeEnd != null">
                n.create_time&lt;=#{createTimeEnd}
            </if>
        </where>



 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java

@@ -160,6 +160,9 @@
     */
    public List<NcNodeVO> searchList2(NcNodeQueryVO queryVO) {
        //1.根据零组件号和创建时间查询初始列表,查询的原始列表，需要hasChild字段，所以使用mapper.xml
        if(queryVO.getCreateTimeEnd()!=null){
            queryVO.setCreateTimeEnd(queryVO.getCreateTimeEnd().plusDays(1));
        }
        List<NcNodeVO> oriList = this.getBaseMapper().searchList2(queryVO);



 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeQueryVO.java

@@ -6,24 +6,28 @@
import org.springblade.mdm.commons.vo.BaseVO;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;


@Schema(description = "首页树查询参数对象")
@Setter
@Getter
public class NcNodeQueryVO {
    @Schema(description = "程序状态隔")
    private List<String> programStatus;
    @Schema(description = "程序状态（试切1;固化2;偏离3），多选逗号分隔")
    private String programStatus;

    private String status;
    @Schema(description = "零组件号")
    private String drawingNo;

    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    //@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @Schema(description = "起始时间")
    private LocalDateTime createTimeBegin;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDate createTimeBegin;
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @Schema(description = "结束时间")
    private LocalDateTime createTimeEnd;
    private LocalDate createTimeEnd;

}