Browse Source

永发1.增加修改打印人,打印日期接口及调试

纪新园 9 months ago
parent
commit
0e6f1496a4

+ 2 - 2
blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/TradingBox.java

@@ -545,7 +545,7 @@ public class TradingBox implements Serializable {
 	 * 打印人
 	 */
 	@ApiModelProperty(value = "打印人")
-	private String printingPersonId;
+	private Long printingPersonId;
 	/**
 	 * 打印人
 	 */
@@ -555,7 +555,7 @@ public class TradingBox implements Serializable {
 	 * 打印时间
 	 */
 	@ApiModelProperty(value = "打印时间")
-	private String printingPersonDate;
+	private Date printingPersonDate;
 
 	/**
 	 * 临时数据

+ 8 - 3
blade-service/blade-los/src/main/java/org/springblade/los/box/controller/TradingBoxController.java

@@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -338,11 +339,15 @@ public class TradingBoxController extends BladeController {
 	/**
 	 * 修改打印人,打印日期
 	 */
-	@PostMapping("/update")
+	@GetMapping("/update")
 	@ApiOperationSupport(order = 6)
 	@RepeatSubmit
-	public R update(@Valid @RequestBody TradingBox tradingBox) {
-		return R.data(tradingBoxService.updateById(tradingBox));
+	public R update(TradingBox tradingBox) {
+		tradingBox.setPrintingPersonId(AuthUtil.getUserId());
+		tradingBox.setPrintingPersonName(AuthUtil.getUserName());
+		tradingBox.setPrintingPersonDate(new Date());
+		tradingBoxService.updateById(tradingBox);
+		return R.data(tradingBox);
 	}
 
 }