浏览代码

耳标检验

523096025 1 年之前
父节点
当前提交
c24217fa3e

+ 1 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/EartagUtil.java

@@ -14,7 +14,7 @@ public class EartagUtil {
     public static void main(String[] args) {
 //        String str =  "123456789123456-789";
 //        String str =  "123456789123456-45,456";
-        String str =  "262060202417302";
+        String str =  "262060202417151-153,155,160,169,171,173,190,195,262060202549131-150";
         EartagResult eartagCollection = getEartagCollection(str);
         System.out.println(eartagCollection.toString());
     }

+ 1 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -82,7 +82,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         calendar.setTime(startTime);
         calendar.add(Calendar.DATE, dayIsolate);
         Date endTime = calendar.getTime();
-        String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum)).getCargoOwner();
+        String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch",5)).getCargoOwner();
         billIsolated.setInspectionName(userName+"的隔离信息");
         billIsolated.setInspectionNum(inspectionNum);
         billIsolated.setIsolatedPosition(isolatedPosition);