优化 导入水电费表时检测一下本次读数必须大于上次读数，导入抄表时，如果

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java

@@ -15,6 +15,7 @@ import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
 import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.po.payFeeBatch.PayFeeBatchPo;
 import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.ImportExcelUtils;
@@ -232,6 +233,9 @@ public class ImportMeterWaterFeeSMOImpl extends DefaultAbstractComponentSMO impl
             importRoomFee.setCurReadingTime(endTime);
             importRoomFee.setPrice(-1);
             rooms.add(importRoomFee);
+            if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
+                throw new IllegalArgumentException((osIndex + 1) + "行本期读数小于上期读数");
+            }
         }
     }
 
@@ -280,6 +284,9 @@ public class ImportMeterWaterFeeSMOImpl extends DefaultAbstractComponentSMO impl
             importRoomFee.setCurDegrees(os[7].toString());
             importRoomFee.setCurReadingTime(endTime);
             rooms.add(importRoomFee);
+            if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
+                throw new IllegalArgumentException((osIndex + 1) + "行本期读数小于上期读数");
+            }
         }
     }
 

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java

@@ -231,7 +231,7 @@ public class ImportOwnerRoomSMOImpl extends DefaultAbstractComponentSMO implemen
                 Assert.hasValue(os[13], (osIndex + 1) + "行性别不能为空");
                 // Assert.hasValue(os[14], (osIndex + 1) + "行年龄不能为空");
                 Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
-                Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
+                //Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
                 Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
             }
 

service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java

@@ -113,6 +113,10 @@ public class SaveMeterWaterCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "curReadingTime", "请求报文中未包含curReadingTime");
         Assert.hasKeyAndValue(reqJson, "objType", "请求报文中未包含objType");
         Assert.hasKeyAndValue(reqJson, "meterType", "请求报文中未包含抄表类型");
+
+        if(reqJson.getDoubleValue("curDegrees") < reqJson.getDoubleValue("preDegrees")){
+            throw new CmdException("当前读数小于上期读数");
+        }
     }
 
     @Override

springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java

@@ -230,6 +230,9 @@ public class ImportMeterWaterFeeSMOImpl extends DefaultAbstractComponentSMO impl
             importRoomFee.setCurReadingTime(endTime);
             importRoomFee.setPrice(-1);
             rooms.add(importRoomFee);
+            if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
+                throw new IllegalArgumentException((osIndex + 1) + "行本期读数小于上期读数");
+            }
         }
     }
 
@@ -278,6 +281,9 @@ public class ImportMeterWaterFeeSMOImpl extends DefaultAbstractComponentSMO impl
             importRoomFee.setCurDegrees(os[7].toString());
             importRoomFee.setCurReadingTime(endTime);
             rooms.add(importRoomFee);
+            if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
+                throw new IllegalArgumentException((osIndex + 1) + "行本期读数小于上期读数");
+            }
         }
     }