zhsw-common/src/main/java/com/rongwei/zhsw/system/importListener/MeterReadingRecordListener.java

@@ -172,13 +172,13 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
                 // 当前户号在系统中不存在
                 if (swUserManagementDo == null) {
                     // 户号不存在
-                    waterUsageEntryDo.setState(2);
+                    waterUsageEntryDo.setState("2");
                 } else {
                     // 增加用户信息
                     waterUsageEntryDo.setAddress(swUserManagementDo.getAddress());
                     waterUsageEntryDo.setUsername(swUserManagementDo.getUsername());
                     waterUsageEntryDo.setUserid(swUserManagementDo.getId());
-                    waterUsageEntryDo.setState(0);
+                    waterUsageEntryDo.setState("0");
                     waterUsageEntryDo.setLastreading(swUserManagementDo.getLastmeterreading());
                     waterUsageEntryDo.setLastreadingdate(swUserManagementDo.getLastmeterreaddate());
                     waterUsageEntryDo.setCommunityname(swUserManagementDo.getVillagename());

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

@@ -122,7 +122,7 @@ public class BillGenerationServiceImpl {
             // 本次抄表日期
             Date currentreadingdate = swWaterUsageEntry.getCurrentreadingdate();
             // 校验 是否已存在抄表记录
-            if (swWaterUsageEntry.getState() == 1) {
+            if (swWaterUsageEntry.getState().equals("1")) {
                 log.error("当前用户：{},时间：{}的抄表记录已生成账单信息", usernumber, currentreadingdate);
                 return;
             }
@@ -132,7 +132,7 @@ public class BillGenerationServiceImpl {
             usageEntryDo.setId(swWaterUsageEntry.getId());
             if (swUserManagementDo == null) {
                 log.error("当前户号不存在");
-                usageEntryDo.setState(2);
+                usageEntryDo.setState("2");
                 saveUsageEntryList.add(usageEntryDo);
                 return;
             }
@@ -140,7 +140,7 @@ public class BillGenerationServiceImpl {
             if (swUserManagementDo.getLastmeterreaddate() != null &&
                     swUserManagementDo.getLastmeterreaddate().compareTo(swWaterUsageEntry.getCurrentreadingdate()) > 0) {
                 log.error("本次抄表日期:{}小于用户表最后一次抄表日期:{}", swUserManagementDo.getLastmeterreaddate(), swWaterUsageEntry.getCurrentreadingdate());
-                usageEntryDo.setState(3);
+                usageEntryDo.setState("3");
                 saveUsageEntryList.add(usageEntryDo);
                 return;
             }
@@ -154,9 +154,9 @@ public class BillGenerationServiceImpl {
             }
 
             if (swBillManagementUnpaidDo == null) {
-                usageEntryDo.setState(4);
+                usageEntryDo.setState("4");
             } else {
-                usageEntryDo.setState(1);
+                usageEntryDo.setState("1");
                 saveList.add(swBillManagementUnpaidDo);
                 // 设置本次的抄表日期
                 swUserManagementDo.setLastmeterreaddate(swBillManagementUnpaidDo.getThismeterreadingdate());

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

@@ -60,7 +60,7 @@ public class MeterReadingServiceImpl implements MeterReadingService {
             throw new CustomException("该抄表记录不是该户号最新的抄表记录，不允许删除!");
         }
         // 如果未生成直接删除并更新用户表信息
-        if(1!=swWaterUsageEntryDo.getState()){
+        if(!swWaterUsageEntryDo.getState().equals("1")){
             swUserManagementService.update(new LambdaUpdateWrapper<SwUserManagementDo>()
                     .eq(SwUserManagementDo::getUsernumber,userNumber)
                     .set(SwUserManagementDo::getLastmeterreaddate,swWaterUsageEntryDo.getLastreadingdate())

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

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

zhsw-entity/src/main/java/com/rongwe/zhsw/system/domain/SwWaterUsageEntryDo.java

@@ -132,7 +132,7 @@ public class SwWaterUsageEntryDo extends BaseDo implements Serializable {
      * 状态(是否已生成账单 0,1)
      */
     @JsonProperty("STATE")
-    private int state;
+    private String state;
 
     /**
      * 是否为底数