From c9db22f6ccb6a6d66e38dec09807e88b160f29e8 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 15 十一月 2023 11:20:50 +0800 Subject: [PATCH] 销售订单-修改2 --- mes-basic/src/main/java/com/chinaztt/mes/basic/service/BasicParamTemplateService.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/BasicParamTemplateService.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/BasicParamTemplateService.java index dbfbe00..6911999 100644 --- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/BasicParamTemplateService.java +++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/BasicParamTemplateService.java @@ -22,13 +22,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaztt.mes.basic.dto.ParamDTO; -import com.chinaztt.mes.basic.entity.Param; import com.chinaztt.mes.basic.entity.ParamJoinTemplate; import com.chinaztt.mes.basic.entity.Template; import com.chinaztt.mes.basic.entity.TemplateTypeRelation; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * 宸ュ簭妯℃澘 @@ -40,16 +40,16 @@ /** * 閫氳繃id鏌ヨ宸ュ簭鍙傛暟 * @param page - * @param gen + * @param * @return */ - IPage<List<Param>> getParamById(Page page, QueryWrapper<ParamDTO> gen); + List<Map<String, Object>> getParamById(Page page, long technologyOperationTemplateId); /** * 宸ュ簭妯℃澘鍏宠仈宸ュ簭鍙傛暟 * @param paramJoinTemplateList * @return */ - List<ParamDTO> relateTypeTemplate(List<ParamJoinTemplate> paramJoinTemplateList); + List<Map<String, Object>> relateTypeTemplate(List<ParamJoinTemplate> paramJoinTemplateList); /** * -- Gitblit v1.9.3