Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r38262 -r38275 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 38262) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 38275) @@ -3750,6 +3750,19 @@ .key("barcode").value(barcode).key("type") .value("tousseInstanceList").key("data") .value(datasJSONArray).endObject().toString(); + } else if (barcodeDevice instanceof User) { + User user = (User) barcodeDevice; + JsonObject data = new JsonObject(); + data.addProperty("barcode", user.getBarcode()); + data.addProperty("name", user.getName()); + data.addProperty("fullName", user.getFullName()); + JsonObject result = new JsonObject(); + result.addProperty("success", true); + result.addProperty("barcode", barcode); + result.addProperty("type", "user"); + result.add("data", data); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_REVIEW, barcodeType, barcode, barcodeName); + return result.toString(); }else if(StringUtils.equals(((BarcodeDevice)barcodeDevice).getType(),BarcodeDevice.BARCODE_TYPE_TOUSSEINSTANCESETCODE)){ List tousseInstanceList = tousseInstanceManager.getTousseInstancesBySetCode(barcodeDevice.getBarcode()); /*JSONArray tousses = new JSONArray(); @@ -4523,8 +4536,15 @@ public String submitReviewTask(JSONObject params) { - String reviewer = AcegiHelper.getLoginUserFullName(); - String reviewerCode = AcegiHelper.getLoginUser().getUserName(); + String reviewer = params.optString("reviewer"); + String reviewerCode = params.optString("reviewerCode"); + //根据(DGSDBZXYY-246 【PDA】【审核打包】新增“审核人”字段)这个问题,将当前登录用户作为默认的审核人的业务代码注释 + /*if(StringUtils.isBlank(reviewer)){ + reviewer = AcegiHelper.getLoginUserFullName(); + } + if(StringUtils.isBlank(reviewerCode)){ + reviewer = AcegiHelper.getLoginUser().getUserName(); + }*/ String taskGroup = params.optString("taskGroup"); String containerBarcode = params.optString("containerBarcode");