样品处理 派发任务 完成接口 可以进行修改 上传附件

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -538,7 +538,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
     public BaseResponse<String> getMaxCementCode() {
         Object obj = redisUtil.getString("maxCementCode");
         String maxCementCode = "";
-        if (obj == null) {
+        String regex = "[0-9]{2}\\-[0-9]{4}";
+        if (obj == null || !obj.toString().matches(regex) ) {
             maxCementCode = sampleMapper.getMaxCementCode();
         } else {
             maxCementCode = obj.toString();
@@ -974,7 +975,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             if (sampleHandle == null) {
                 return BaseResponse.errorMsg("信息错误");
             }
-            if (sampleHandle.getStatus() != 1) {
+            if (sampleHandle.getStatus() != 1 && sampleHandle.getStatus() != 2 ) {
                 return BaseResponse.errorMsg("状态错误");
             }
             if (loginUser.getId() != sampleHandle.getUserId()) {
@@ -1305,7 +1306,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             if (distribution == null) {
                 return BaseResponse.errorMsg("信息错误");
             }
-            if (distribution.getStatus() != 1) {
+            if (distribution.getStatus() != 1 && distribution.getStatus() != 2) {
                 return BaseResponse.errorMsg("状态错误");
             }
             distribution.setStatus(2).setFinishTime(LocalDateTime.now());