修改管材

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java

@@ -353,7 +353,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
                 Map map = orgService.getdetialInfo(welderId.toString( ));
                 String certValidDate = String.valueOf(map.get("certValidDate"));
 
-                if (StringUtils.isNotEmpty(certValidDate)) {
+                if (!ValidationUtil.isEmpty(certValidDate)) {
                     Date vaildParse =null;
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     try {
@@ -363,7 +363,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
                     }
 
 
-                    if (time .compareTo(vaildParse) <=0) {
+                    if (time.compareTo(vaildParse) <=0) {
                         jsonObject.put("valid","有效");
                     }else {
                         jsonObject.put("valid","已过期");
@@ -392,8 +392,12 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
             //管材未校验,进行效验步骤
            // Long materialId = jsonObject.getLong("materialId");//管材id
-            //改为管材编号
+            //从图片中获取管材编号
+
+
+
             String materialCode = jsonObject.getString("materialId");
+
             verify.setStage(StageEnum.焊前管材质量.getStage());
             /**校验*/
             Boolean flag =false;