From d5fc264f0e99391677f6d008b9608da434b27c59 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 24 七月 2024 17:31:02 +0800 Subject: [PATCH] 加班工时完成 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java index 3588972..8408e81 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java @@ -373,21 +373,16 @@ insProduct.setManHourGroup(product.getManHourGroup()); insProduct.setInspectionItemType("0"); insProduct.setInspectionValueType("1"); + if (product.getInspectionItem().equals("鐑惊鐜�")) { + insProduct.setInspectionItemClass("鐩存祦鐢甸樆");//妫�楠屽瓙瀛愰」--鐩存祦鐢甸樆 + insProduct.setInspectionItemClassEn("DC resistance");//妫�楠屽瓙瀛愰」鑻辨枃--鐩存祦鐢甸樆 + insProduct.setUnit("惟/km");//鍗曚綅 + } insProducts.add(insProduct); + insProductes.add(insProduct); + insProductess.add(insProduct); } //鐑惊鐜墠鏈夊娆″惊鐜鏁� - if (product.getInspectionItem().equals("鐑惊鐜�")) { - //鐑惊鐜繕瑕佸姞涓婄洿娴佺數闃� - for (InsProduct insProduct : insProducts) { - InsProduct insProduct1 = new InsProduct(); - BeanUtils.copyProperties(insProduct, insProduct1); - insProduct1.setInspectionItemClass("鐩存祦鐢甸樆");//妫�楠屽瓙瀛愰」--鐩存祦鐢甸樆 - insProduct1.setInspectionItemClassEn("DC resistance");//妫�楠屽瓙瀛愰」鑻辨枃--鐩存祦鐢甸樆 - insProduct1.setUnit("惟/km");//鍗曚綅 - insProductes.add(insProduct1); - insProductess.add(insProduct1); - } - } if (count > 1) { //寰幆瓒呰繃1娆� for (int j = 2; j <= count; j++) { -- Gitblit v1.9.3