Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-15 5a7683e98e626cba3b52fd621b4d5340e16b6f2a

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/FlowCardMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.mes.pp.entity.FlowCard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.pp.entity.dto.FlowCardDTO;
import feign.Param;

import java.util.List;
@@ -10,7 +11,7 @@

/**
 * <p>
 *  Mapper 接口
 * Mapper 接口
 * </p>
 *
 * @author wu
@@ -19,9 +20,12 @@
@DS("pp")
public interface FlowCardMapper extends BaseMapper<FlowCard> {

    List<Map<String, Object>> selectProject(@Param("processId") String processId,@Param("technologyNumber") Integer technologyNumber);
    List<Map<String, Object>> selectProject(@Param("processId") String processId, @Param("technologyNumber") Integer technologyNumber);

    List<Map<String, Object>> selectFlowCard(@Param("processId") String processId,@Param("technologyNumber") Integer technologyNumber);
    List<Map<String, Object>> selectFlowCard(@Param("processId") String processId, @Param("technologyNumber") Integer technologyNumber);

    List<Map<String, Object>> selectLabel(@Param("processId") String processId,@Param("technologyNumber") Integer technologyNumber);
    List<Map<String, Object>> selectLabel(@Param("processId") String processId, @Param("technologyNumber") Integer technologyNumber);

    List<FlowCardDTO> flowCardReportForms(@Param("orderId") String orderId);

}