From 0e8aae27274c1b1b7a283ba73963af78417202c3 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 06 七月 2024 13:32:52 +0800 Subject: [PATCH] 冠鸿接口对接 --- src/main/java/com/zy/asrs/entity/WrkMast.java | 47 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java index 30bdbc0..b917411 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMast.java +++ b/src/main/java/com/zy/asrs/entity/WrkMast.java @@ -67,7 +67,7 @@ /** - * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鏈媶 1: 宸叉媶 + * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鍒濆 1銆佹湭鎷嗗凡涓婃姤 2: 宸叉媶 3:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛� */ @ApiModelProperty(value= "") @TableField("sheet_no") @@ -378,21 +378,22 @@ } public String getStaNo$(){ - BasDevpService service = SpringUtils.getBean(BasDevpService.class); - BasDevp basDevp = service.selectById(this.staNo); - if (!Cools.isEmpty(basDevp)){ - return String.valueOf(basDevp.getDevNo()); - } - return null; +// BasDevpService service = SpringUtils.getBean(BasDevpService.class); +// BasDevp basDevp = service.selectById(this.staNo); +// if (!Cools.isEmpty(basDevp)){ +// return String.valueOf(basDevp.getDevNo()); +// } + return String.valueOf(this.staNo); } public String getSourceStaNo$(){ - BasDevpService service = SpringUtils.getBean(BasDevpService.class); - BasDevp basDevp = service.selectById(this.sourceStaNo); - if (!Cools.isEmpty(basDevp)){ - return String.valueOf(basDevp.getDevNo()); - } - return null; + +// BasDevpService service = SpringUtils.getBean(BasDevpService.class); +// BasDevp basDevp = service.selectById(this.sourceStaNo); +// if (!Cools.isEmpty(basDevp)){ +// return String.valueOf(basDevp.getDevNo()); +// } + return String.valueOf(this.sourceStaNo); } public String getSourceLocNo$(){ @@ -499,6 +500,26 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime); } + public String getSheetNo$(){ + if (null == this.sheetNo){ return "鏈煡"; } + switch (this.sheetNo){ + case "0": + return "榛樿"; + case "1": + return "鏈烘鑷傛姄鍙栦腑"; + case "2": + return "鎶撳彇瀹屾垚"; + case "3": + return "浠诲姟瀹屾垚"; + case "4": + return "鏈烘鑷傛姄鍙栦腑"; + case "5": + return "鐮佸灈瀹屾垚"; + default: + return this.sheetNo; + } + } + } -- Gitblit v1.9.1