Merge remote-tracking branch 'origin/master'

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwMeterExchangeRegisterServiceImpl.java

@@ -65,6 +65,9 @@ public class SwMeterExchangeRegisterServiceImpl extends ServiceImpl<SwMeterExcha
 
         // 3. 插入新表数据
         if (newEntry != null) {
+            //设置无需生成账单
+            newEntry.setState(5);
+//            newEntry.setLastreadingdate()
             swWaterUsageEntryDao.insert(newEntry);
         }
 

zhsw-server/src/main/java/com/rongwei/zhsw/system/controller/SwWaterChangeMeterController.java

@@ -17,8 +17,14 @@ public class SwWaterChangeMeterController {
 
     @PostMapping("/changeMeter")
     public R ChangeMeter(@RequestBody ChangeMeterDTO request) {
-        swMeterExchangeRegisterService.changemeter(request.getNewrecord(), request.getChangemeterinfo());
-        return R.ok();
+        try {
+            swMeterExchangeRegisterService.changemeter(request.getNewrecord(), request.getChangemeterinfo());
+            return R.ok();
+        } catch (IllegalArgumentException e) {
+            return R.error(e.getMessage());
+        } catch (Exception e) {
+            return R.error("换表过程中出现未知异常，请稍后重试");
+        }
     }
 
 }