diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java index 24c1182..98e3950 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java @@ -62,7 +62,7 @@ public class RegRequestInfoController extends BaseController { @ApiOperation("打印条码") @GetMapping("/print") public Result printBarCode(String applyId){ - return regRequestInfoService.printBarCode(applyId); + return regRequestInfoService.printBarCode(applyId,getUsername()); } @ApiOperation("作废申请单") diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java index 288d48e..3163349 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java @@ -13,7 +13,7 @@ public interface RegRequestInfoService { Result saveReqInfo(ReqApplyInfoDTO reqApplyInfoDTO); - Result printBarCode(String applyId); + Result printBarCode(String applyId,String userName); Result cancelReq(String applyId); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index 0b77071..bd83341 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -146,7 +146,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { * @return */ @Override - public Result printBarCode(String applyId) { + public Result printBarCode(String applyId,String userName) { //产生条码信息 Result result1 = createBarcode(applyId); if(!result1.getCode().equals("0")) return result1; @@ -159,7 +159,7 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { if(barcodeList.contains(transitSampleDetail.getBarcode())) continue; barcodeList.add(transitSampleDetail.getBarcode()); } - Result result = printBar(barcodeList); + Result result = printBar(barcodeList,userName); if(!result.equals("0")) return result; for (String barCode: barcodeList) { //修改状态 @@ -436,14 +436,14 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { * 打印条码 * @param barcode */ - public Result printBar(List barcode){ + public Result printBar(List barcode,String userName){ String sqhStr = StrUtil.join(",", barcode); LabIntersendList labIntersendList = new LabIntersendList(); String guid = UUID.randomUUID().toString(); labIntersendList.setGuid(guid); labIntersendList.setSendtype("1"); labIntersendList.setSenddata(sqhStr); - labIntersendList.setUserid(""); //userId + labIntersendList.setUserid(userName); labIntersendList.setCreatedate(commonUtil.getCurrentTime()); labIntersendListMapper.insert(labIntersendList); WebSocketMessage wsMessage=new WebSocketMessage();