From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/BasicParamTemplateController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/BasicParamTemplateController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/BasicParamTemplateController.java
index 3653824..4663bda 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/BasicParamTemplateController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/BasicParamTemplateController.java
@@ -25,7 +25,6 @@
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
import com.chinaztt.ztt.common.core.util.R;
import com.chinaztt.ztt.common.log.annotation.SysLog;
-import com.chinaztt.ztt.common.security.annotation.Inner;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -82,6 +81,7 @@
@ApiOperation(value = "瀵煎叆鐨勬ā鏉跨殑涓嬭浇", notes = "瀵煎叆鐨勬ā鏉跨殑涓嬭浇")
@GetMapping("/uploadTemplate/{fileName}" )
public void uploadTemplate(@PathVariable String fileName, HttpServletResponse response) {
+ System.out.println(fileName);
basicParamTemplateService.uploadTemplate(response, fileName);
}
/**
@@ -98,13 +98,14 @@
/**
* 閫氳繃id鏌ヨ宸ュ簭鍙傛暟
- * @param id id
+ * @param id
* @return R
*/
@ApiOperation(value = "閫氳繃id鏌ヨ宸ュ簭鍙傛暟", notes = "閫氳繃id鏌ヨ宸ュ簭鍙傛暟")
@GetMapping("/param" )
public R getParamById(Page page, ParamDTO paramDTO) {
- return R.ok(basicParamTemplateService.getParamById(page,QueryWrapperUtil.gen(paramDTO)));
+ Long technologyOperationTemplateId = paramDTO.getTechnologyOperationTemplateId();
+ return R.ok(basicParamTemplateService.getParamById(page,technologyOperationTemplateId));
}
/**
* 鏂板宸ュ簭妯℃澘
--
Gitblit v1.9.3