补片管理后端筛选查询

廖井涛

2024-09-13 8c64b400bfb6e995061e36fb0ce61cad36638a42

补片管理后端筛选查询

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -7,7 +7,6 @@
import deepClone from "@/utils/deepClone";
import {Search} from "@element-plus/icons-vue";
import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent,filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

@@ -58,6 +57,7 @@
request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data)
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal

@@ -71,6 +71,43 @@
    ElMessage.warning(res.msg)
  }
})

const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}
function filterChanged(column){
  gridOptions.loading=true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0]!=undefined?column.datas[0]:''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.')>-1){
    const  columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]:value
    }
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Replenish/SelectReplenish/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      total.dataTotal = res.data.total.total*1
      total.pageTotal= res.data.total.pageTotal

      selectDate.value = res.data.selectDate
      pageNum.value=1

      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
    }else{
      ElMessage.warning(res.msg)
    }
  })
}



@@ -95,7 +132,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    //remote: true
    remote: true
  },
  customConfig: {
    storage: true
@@ -110,33 +147,33 @@
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {field: 'review_status',title: t('basicData.review'), width: 50, slots: { default: 'state' }},
    {field: 'patch_id', width: 120, title: t('replenish.patchNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'order_id', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'process_id', width: 140, title: t('processCard.processId'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'batch', width: 80, title: t('order.batch'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glassNumber', width: 100, title: t('reportingWorks.glassNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'order_sort', width: 100, title:t('order.OrderNum'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'technology_number', width: 80, title: t('replenish.mark'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_type', width: 100, title: t('reportingWorks.breakageType'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_reason', width: 120, title: t('reportingWorks.breakageReason'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'responsible_equipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'responsible_team', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_processes', width: 120, title:  t('reportingWorks.reportingProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reviewStatus',title: t('basicData.review'), width: 50, slots: { default: 'state' }},
    {field: 'patchId', width: 120, title: t('replenish.patchNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'orderId', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'processId', width: 140, title: t('processCard.processId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'batch', width: 80, title: t('order.batch'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'glassNumber', width: 100, title: t('reportingWorks.glassNumber')},
    {field: 'orderSort', width: 100, title:t('order.OrderNum'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'technologyNumber', width: 80, title: t('replenish.mark'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchType', width: 100, title: t('reportingWorks.breakageType'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchReason', width: 120, title: t('reportingWorks.breakageReason'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchProcesses', width: 120, title:  t('reportingWorks.reportingProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    //{field: 'building_number',width: 120, title: '楼层编号', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glass_address', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_num', width: 80, title: t('order.quantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'patch_area', width: 120, title: t('order.area'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'width', width: 80, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'height', width: 80, title: t('order.height'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'shape', width: 80, title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'quality_inspector', width: 100, title: t('reportingWorks.qualityInspector'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reviewer', width: 100, title: t('productStock.reviewed'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'create_time', width: 100, title: t('productStock.productionDate')},
    {field: 'update_time', width: 120, title: t('productStock.approvedDate')},
    {field: 'product_name', width: 120, title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'reporting_work_id', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'glassAddress', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchNum', width: 80, title: t('order.quantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'patchArea', width: 120, title: t('order.area'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'width', width: 80, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'height', width: 80, title: t('order.height'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'shape', width: 80, title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'qualityInspector', width: 100, title: t('reportingWorks.qualityInspector'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reviewer', width: 100, title: t('productStock.reviewed'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'createTime', width: 100, title: t('productStock.productionDate')},
    {field: 'updateTime', width: 120, title: t('productStock.approvedDate')},
    {field: 'productName', width: 120, title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
    {field: 'reportingWorkId', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'}},

  ],//表头按钮

@@ -339,6 +376,7 @@
    </el-header>

    <vxe-grid
        @filter-change="filterChanged"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -1007,7 +1007,8 @@
  let orderId ={
    oldOrderId:titleUploadData.value.orderId,
    newOrderId:newOrderId.value,
    orderIdType:company.orderIdType
    orderIdType:company.orderIdType,
    creator:userStore.user.userName,
  }
  request.post(`/order/updateOrderId`,orderId).then((res) => {
    if(res.code==200 && res.data==="true"){

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java

@@ -4,6 +4,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.pp.PatchLogAddDTO;
import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
@@ -40,8 +41,8 @@
    @ApiOperation("补片查询接口")
    @SaCheckPermission("SelectReplenish.search")
    @PostMapping("/SelectReplenish/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLog patchLog){
        return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLog));
    public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLogDTO patchLogDTO){
        return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLogDTO));
    }



 north-glass-erp/src/main/java/com/example/erp/dto/pp/PatchLogDTO.java

New file
@@ -0,0 +1,45 @@
package com.example.erp.dto.pp;

import lombok.Data;

import java.time.LocalDate;

@Data
public class PatchLogDTO {
    private Long id;
    private String orderId;
    private Integer reviewStatus;
    private String reportingWorkId;
    private String patchId;
    private String processId;
    private Integer orderSort;
    private String project;
    private String batch;
    private String buildingNumber;
    private String productName;
    private Integer technologyNumber;
    private String glassAddress;
    private Integer patchNum;
    private Double width;
    private Double height;
    private String shape;
    private String patchType;
    private String patchReason;
    private String responsibleTeam;
    private String responsiblePersonnel;
    private String responsibleEquipment;
    private String patchArea;
    private String qualityInspector;
    private String patchProcesses;
    private String reviewer;
    private LocalDate createTime;
    private LocalDate updateTime;
    private String glassNumber;







}

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java

@@ -1,6 +1,7 @@
package com.example.erp.mapper.pp;

import com.example.erp.dto.pp.PatchLogAddDTO;
import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.github.yulichang.base.MPJBaseMapper;
@@ -13,9 +14,11 @@
@Mapper
public interface PatchLogMapper extends MPJBaseMapper<PatchLog> {

    List<Map<String,Object>> SelectReplenish(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
    List<PatchLogDTO> SelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz,
                                      String startDate, String endDate,@Param("patchLog") PatchLogDTO patchLogDTO);

    Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
    Map<String,Integer> SelectReplenishPageTotal(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,
                                                 String startDate,String endDate,@Param("patchLog") PatchLogDTO patchLogDTO);




 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java

@@ -5,6 +5,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.dto.pp.PatchLogAddDTO;
import com.example.erp.dto.pp.PatchLogDTO;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
@@ -57,7 +58,7 @@

    }

    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize,List<String> selectDate,PatchLog patchLog) {
    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {
        Integer offset = (pageNum-1)*pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
@@ -70,8 +71,9 @@
            }
        }
        Map<String,Object> map = new HashMap<>();
        map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLog));
        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLog));
        System.out.println(patchLogDTO.getPatchId());
        map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));
        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));

        List<String> list = new ArrayList<>();
        list.add(startDate);

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -689,6 +689,13 @@
        String oldOrderId = orderJson.getString("oldOrderId");
        String newOrderId = orderJson.getString("newOrderId");
        String orderIdType = orderJson.getString("orderIdType");

        Log log = new Log();
        log.setContent(map.toString());
        log.setFunction("updateOrderId修改订单号");
        log.setOperator(orderJson.getString("creator"));


        if(!Objects.equals(newOrderId, oldOrderId)){
            if(newOrderId.length()!=10){
                return "false4";
@@ -721,6 +728,7 @@
            if(count1>0 && count2==0){
                orderMapper.updateOrderId(oldOrderId,newOrderId);
                saveState= "true";
                logService.saveLog(log);
            }else if(count1==0){
                saveState= "false1";
                ;

 north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml

@@ -47,6 +47,81 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
            <if test="patchLog.patchId != null and patchLog.patchId != ''">
                and r.patch_id regexp #{patchLog.patchId}
            </if>
            <if test="patchLog.orderId != null and patchLog.orderId != ''">
                and r.order_id regexp #{patchLog.orderId}
            </if>
            <if test="patchLog.reportingWorkId != null and patchLog.reportingWorkId != ''">
                and r.reporting_work_id regexp #{patchLog.reportingWorkId}
            </if>
            <if test="patchLog.processId != null and patchLog.processId != ''">
                and r.process_id regexp #{patchLog.processId}
            </if>
            <if test="patchLog.project != null and patchLog.project != ''">
                and o.project regexp #{patchLog.project}
            </if>
            <if test="patchLog.batch != null and patchLog.batch != ''">
                and o.batch regexp #{patchLog.batch}
            </if>
            <if test="patchLog.orderSort != null and patchLog.orderSort != ''">
                and r.order_sort regexp #{patchLog.orderSort}
            </if>
            <if test="patchLog.buildingNumber != null and patchLog.buildingNumber != ''">
                and od.building_number regexp #{patchLog.buildingNumber}
            </if>
            <if test="patchLog.productName != null and patchLog.productName != ''">
                and od.product_name regexp #{patchLog.productName}
            </if>
            <if test="patchLog.technologyNumber != null and patchLog.technologyNumber != ''">
                and r.technology_number regexp #{patchLog.technologyNumber}
            </if>
            <if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
                and r.quality_inspector regexp #{patchLog.qualityInspector}
            </if>
            <if test="patchLog.width != null and patchLog.width != ''">
                and od.width regexp #{patchLog.width}
            </if>
            <if test="patchLog.height != null and patchLog.height != ''">
                and od.height regexp #{patchLog.height}
            </if>
            <if test="patchLog.shape != null and patchLog.shape != ''">
                and od.shape regexp #{patchLog.shape}
            </if>
            <if test="patchLog.patchNum != null and patchLog.patchNum != ''">
                and r.patch_num regexp #{patchLog.patchNum}
            </if>
            <if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
                and ogd.glass_address regexp #{patchLog.glassAddress}
            </if>
            <if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
                and r.responsible_team regexp #{patchLog.responsibleTeam}
            </if>
            <if test="patchLog.responsibleEquipment != null and patchLog.responsibleEquipment != ''">
                and r.responsible_equipment regexp #{patchLog.responsibleEquipment}
            </if>
            <if test="patchLog.responsiblePersonnel != null and patchLog.responsiblePersonnel != ''">
                and r.responsible_personnel regexp #{patchLog.responsiblePersonnel}
            </if>
            <if test="patchLog.patchType != null and patchLog.patchType != ''">
                and r.patch_type regexp #{patchLog.patchType}
            </if>
            <if test="patchLog.patchReason != null and patchLog.patchReason != ''">
                and r.patch_reason regexp #{patchLog.patchReason}
            </if>
            <if test="patchLog.patchArea != null and patchLog.patchArea != ''">
                and r.patch_area regexp #{patchLog.patchArea}
            </if>
            <if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
                and r.quality_inspector regexp #{patchLog.qualityInspector}
            </if>
            <if test="patchLog.patchProcesses != null and patchLog.patchProcesses != ''">
                and r.patch_processes regexp #{patchLog.patchProcesses}
            </if>
            <if test="patchLog.reviewer != null and patchLog.reviewer != ''">
                and r.reviewer regexp #{patchLog.reviewer}
            </if>
        </where>
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
@@ -62,6 +137,81 @@
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            <if test="patchLog.patchId != null and patchLog.patchId != ''">
                and r.patch_id regexp #{patchLog.patchId}
            </if>
            <if test="patchLog.orderId != null and patchLog.orderId != ''">
                and r.order_id regexp #{patchLog.orderId}
            </if>
            <if test="patchLog.reportingWorkId != null and patchLog.reportingWorkId != ''">
                and r.reporting_work_id regexp #{patchLog.reportingWorkId}
            </if>
            <if test="patchLog.processId != null and patchLog.processId != ''">
                and r.process_id regexp #{patchLog.processId}
            </if>
            <if test="patchLog.project != null and patchLog.project != ''">
                and o.project regexp #{patchLog.project}
            </if>
            <if test="patchLog.batch != null and patchLog.batch != ''">
                and o.batch regexp #{patchLog.batch}
            </if>
            <if test="patchLog.orderSort != null and patchLog.orderSort != ''">
                and r.order_sort regexp #{patchLog.orderSort}
            </if>
            <if test="patchLog.buildingNumber != null and patchLog.buildingNumber != ''">
                and od.building_number regexp #{patchLog.buildingNumber}
            </if>
            <if test="patchLog.productName != null and patchLog.productName != ''">
                and od.product_name regexp #{patchLog.productName}
            </if>
            <if test="patchLog.technologyNumber != null and patchLog.technologyNumber != ''">
                and r.technology_number regexp #{patchLog.technologyNumber}
            </if>
            <if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
                and r.quality_inspector regexp #{patchLog.qualityInspector}
            </if>
            <if test="patchLog.width != null and patchLog.width != ''">
                and od.width regexp #{patchLog.width}
            </if>
            <if test="patchLog.height != null and patchLog.height != ''">
                and od.height regexp #{patchLog.height}
            </if>
            <if test="patchLog.shape != null and patchLog.shape != ''">
                and od.shape regexp #{patchLog.shape}
            </if>
            <if test="patchLog.patchNum != null and patchLog.patchNum != ''">
                and r.patch_num regexp #{patchLog.patchNum}
            </if>
            <if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
                and ogd.glass_address regexp #{patchLog.glassAddress}
            </if>
            <if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
                and r.responsible_team regexp #{patchLog.responsibleTeam}
            </if>
            <if test="patchLog.responsibleEquipment != null and patchLog.responsibleEquipment != ''">
                and r.responsible_equipment regexp #{patchLog.responsibleEquipment}
            </if>
            <if test="patchLog.responsiblePersonnel != null and patchLog.responsiblePersonnel != ''">
                and r.responsible_personnel regexp #{patchLog.responsiblePersonnel}
            </if>
            <if test="patchLog.patchType != null and patchLog.patchType != ''">
                and r.patch_type regexp #{patchLog.patchType}
            </if>
            <if test="patchLog.patchReason != null and patchLog.patchReason != ''">
                and r.patch_reason regexp #{patchLog.patchReason}
            </if>
            <if test="patchLog.patchArea != null and patchLog.patchArea != ''">
                and r.patch_area regexp #{patchLog.patchArea}
            </if>
            <if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
                and r.quality_inspector regexp #{patchLog.qualityInspector}
            </if>
            <if test="patchLog.patchProcesses != null and patchLog.patchProcesses != ''">
                and r.patch_processes regexp #{patchLog.patchProcesses}
            </if>
            <if test="patchLog.reviewer != null and patchLog.reviewer != ''">
                and r.reviewer regexp #{patchLog.reviewer}
            </if>
        </where>
              ) as zu
        limit #{offset},#{pageSize};
@@ -165,10 +315,10 @@
                and dd.reporting_work_id regexp #{patchLogAddDTO.reportingWorkId}
            </if>
            <if test="patchLogAddDTO.productionId != null and patchLogAddDTO.productionId != ''">
                and rw.process_id regexp #{patchLogAddDTO.productionId}
                and rw.production_id regexp #{patchLogAddDTO.productionId}
            </if>
            <if test="patchLogAddDTO.processId != null and patchLogAddDTO.processId != ''">
                and o.order_id regexp #{patchLogAddDTO.processId}
                and rw.process_id regexp #{patchLogAddDTO.processId}
            </if>
            <if test="patchLogAddDTO.project != null and patchLogAddDTO.project != ''">
                and o.project regexp #{patchLogAddDTO.project}