diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java index 8edfcf8..8b3a2fd 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/SampleSignVO.java @@ -64,4 +64,7 @@ public class SampleSignVO { private String opercode; @ApiModelProperty(value = "上机操作人姓名") private String opername; + //目前就只是取消审核的时候用 + @ApiModelProperty(value = "审核状态") + private String checkStatus; } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java index 1187271..67e63a7 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java @@ -268,13 +268,17 @@ public class RegInterfaceImpl { Date operdatetime = sampleSignVO.getOperdatetime(); String opercode = sampleSignVO.getOpercode(); String opername = sampleSignVO.getOpername(); + String checkStatus = sampleSignVO.getCheckStatus(); if(operdatetime == null) return new Result("-1","上机时间不能为空!"); if(opername == null || opername.equals("")) return new Result("-1","上机人姓名不能为空!"); RegTransitSample regTransitSample60 = new RegTransitSample(); + //传了值,代表是上机,没有传,代表只是取消审核 + if(checkStatus == null || checkStatus.equals("")){ + regTransitSample60.setOperdatetime(operdatetime); + regTransitSample60.setOpercode(opercode); + regTransitSample60.setOpername(opername); + } regTransitSample60.setBarcode(barcode); - regTransitSample60.setOperdatetime(operdatetime); - regTransitSample60.setOpercode(opercode); - regTransitSample60.setOpername(opername); regTransitSample60.setStatus("60"); requestInfoUtil.updateRegTransitSampleStatus(regTransitSample60,regApply);