refactor(property): 重构财产管理模块

- 将 Date 类型替换为 LocalDateTime 和 LocalDate
- 新增多个财产管理相关的控制器
- 修改现有控制器以使用新的时间类型
- 更新 application-dev.yml 配置日志级别

src/main/java/com/zksy/common/domain/FileManager.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -64,7 +66,7 @@ public class FileManager implements Serializable {
     /**
      * 创建时间
      */
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 修改人
@@ -74,7 +76,7 @@ public class FileManager implements Serializable {
     /**
      * 修改时间
      */
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 是否删除（0否1是）

src/main/java/com/zksy/controller/common/FileManagerController.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -28,7 +30,7 @@ public class FileManagerController {
     public AjaxResult save(@RequestBody FileManagerDTO fileManagerDTO) {
         FileManager xcrFile = buildXrcFile(fileManagerDTO);
         xcrFile.setCreateBy("管理员");
-        xcrFile.setCreateTime(new Date());
+        xcrFile.setCreateTime(LocalDateTime.now());
         return service.saveMinio(xcrFile, fileManagerDTO.getFile())
                 ? AjaxResult.success(xcrFile)
                 : AjaxResult.error("新增失败");
@@ -39,7 +41,7 @@ public class FileManagerController {
     public AjaxResult updateById(FileManagerDTO fileManagerDTO) {
         FileManager xcrFile = buildXrcFile(fileManagerDTO);
         xcrFile.setUpdateBy("管理员");
-        xcrFile.setUpdateTime(new Date());
+        xcrFile.setUpdateTime(LocalDateTime.now());
         return service.updateMinio(xcrFile, fileManagerDTO.getFile())
                 ? AjaxResult.success(xcrFile)
                 : AjaxResult.error("更新失败");

src/main/java/com/zksy/controller/info/EAdminLicenseInfoController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EAdminLicenseInfoController {
     @PostMapping("/update")
     @ApiOperation(value = "行政许可信息修改")
     public AjaxResult update(@RequestBody EAdminLicenseInfo eAdminLicenseInfo) {
-        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        eAdminLicenseInfo.setUpdateTime(LocalDateTime.now());
         return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EArchivesAdministrationController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -51,7 +53,7 @@ public class EArchivesAdministrationController {
     @PostMapping("/update")
     @ApiOperation(value = "员工档案管理修改")
     public AjaxResult update(@RequestBody EArchivesAdministration eAdminLicenseInfo) {
-        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        eAdminLicenseInfo.setUpdateTime(LocalDateTime.now());
         return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EContactManagementController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EContactManagementController {
     @PostMapping("/update")
     @ApiOperation(value = "联系人管理信息修改")
     public AjaxResult update(@RequestBody EContactManagement econtactManagement) {
-        econtactManagement.setUpdateTime(new DateTime());
+        econtactManagement.setUpdateTime(LocalDateTime.now());
         return service.updateById(econtactManagement) ? AjaxResult.success(econtactManagement) : AjaxResult.error("更新失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEmployeeBenefitController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EEmployeeBenefitController {
     @PostMapping("/update")
     @ApiOperation(value = "员工福利管理修改")
     public AjaxResult update(@RequestBody EEmployeeBenefit eemployeeBenefit) {
-        eemployeeBenefit.setUpdateTime(new DateTime());
+        eemployeeBenefit.setUpdateTime(LocalDateTime.now());
         return service.updateById(eemployeeBenefit)? AjaxResult.success(eemployeeBenefit): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEmployeeInfoController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author Administrator
@@ -53,7 +55,7 @@ public class EEmployeeInfoController {
     @PostMapping("/update")
     @ApiOperation(value = "员工基本信息修改")
     public AjaxResult update(@RequestBody EEmployeeInfo eemployeeInfo, MultipartFile multipartFile) {
-        eemployeeInfo.setUpdateTime(new DateTime());
+        eemployeeInfo.setUpdateTime(LocalDateTime.now());
         return service.updateEEmployeeInfo(eemployeeInfo, multipartFile)? AjaxResult.success(eemployeeInfo): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEmployeeMasterController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -54,7 +56,7 @@ public class EEmployeeMasterController {
     @PostMapping("/update")
     @ApiOperation(value = "员工合同管理修改")
     public AjaxResult update(@RequestBody EEmployeeMaster eemployeeMaster) {
-        eemployeeMaster.setUpdateTime(new DateTime());
+        eemployeeMaster.setUpdateTime(LocalDateTime.now());
         return service.updateById(eemployeeMaster) ? AjaxResult.success(eemployeeMaster) : AjaxResult.error("更新失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEmployeeSalaryController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EEmployeeSalaryController {
     @PostMapping("/update")
     @ApiOperation(value = "员工薪资管理修改")
     public AjaxResult update(@RequestBody EEmployeeSalary eemployeeSalary) {
-        eemployeeSalary.setUpdateTime(new DateTime());
+        eemployeeSalary.setUpdateTime(LocalDateTime.now());
         return service.updateById(eemployeeSalary)? AjaxResult.success(eemployeeSalary): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEnterpriseElectricityAnnualStatisticsController.java

@@ -1,6 +1,7 @@
 package com.zksy.controller.info;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.zksy.info.domain.EEnterpriseElectricityAnnualStatistics;
 import com.zksy.info.domain.EQuarterlyElectricityBill;
 import com.zksy.info.service.EEnterpriseElectricityAnnualStatisticsService;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +56,7 @@ public class EEnterpriseElectricityAnnualStatisticsController {
     @PostMapping("/update")
     @ApiOperation(value = "企业年度用电修改")
     public AjaxResult update(@RequestBody EEnterpriseElectricityAnnualStatistics entity) {
-        entity.setUpdateTime(new DateTime());
+        entity.setUpdateTime(LocalDateTime.now());
         return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEnterpriseInfoController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EEnterpriseInfoController {
     @PostMapping("/update")
     @ApiOperation(value = "企业基本信息修改")
     public AjaxResult update(@RequestBody  EEnterpriseInfo houseType) {
-        houseType.setUpdateTime(new DateTime());
+        houseType.setUpdateTime(LocalDateTime.now());
         return service.updateById(houseType) ? AjaxResult.success(houseType) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEnterprisePowerInfoController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EEnterprisePowerInfoController {
     @PostMapping("/update")
     @ApiOperation(value = "企业用电信息修改")
     public AjaxResult update(@RequestBody EEnterprisePowerInfo eEnterprisePowerInfo) {
-        eEnterprisePowerInfo.setUpdateTime(new DateTime());
+        eEnterprisePowerInfo.setUpdateTime(LocalDateTime.now());
         return service.updateById(eEnterprisePowerInfo) ? AjaxResult.success(eEnterprisePowerInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EEnterpriseWaterAnnualStatisticsController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EEnterpriseWaterAnnualStatisticsController {
     @PostMapping("/update")
     @ApiOperation(value = "企业年度用水修改")
     public AjaxResult update(@RequestBody EEnterpriseWaterAnnualStatistics entity) {
-        entity.setUpdateTime(new DateTime());
+        entity.setUpdateTime(LocalDateTime.now());
         return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EGasController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EGasController {
     @PostMapping("/update")
     @ApiOperation(value = "燃气信息修改")
     public AjaxResult update(@RequestBody EGas egas) {
-        egas.setUpdateTime(new DateTime());
+        egas.setUpdateTime(LocalDateTime.now());
         return service.updateById(egas) ? AjaxResult.success(egas) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EQualificationCertificateController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EQualificationCertificateController {
     @PostMapping("/update")
     @ApiOperation(value = "资质证书修改")
     public AjaxResult update(@RequestBody EQualificationCertificate eAdminLicenseInfo) {
-        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        eAdminLicenseInfo.setUpdateTime(LocalDateTime.now());
         return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EQuarterlyElectricityBillController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class EQuarterlyElectricityBillController {
     @PostMapping("/update")
     @ApiOperation(value = "用电信息修改")
     public AjaxResult update(@RequestBody EQuarterlyElectricityBill equarterlyElectricityBill) {
-        equarterlyElectricityBill.setUpdateTime(new DateTime());
+        equarterlyElectricityBill.setUpdateTime(LocalDateTime.now());
         return service.updateById(equarterlyElectricityBill) ? AjaxResult.success(equarterlyElectricityBill) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/info/EQuarterlyWaterUsageController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -51,7 +53,7 @@ public class EQuarterlyWaterUsageController {
     @PostMapping("/update")
     @ApiOperation(value = "用水信息修改")
     public AjaxResult update(@RequestBody EQuarterlyWaterUsage ewater) {
-        ewater.setUpdateTime(new DateTime());
+        ewater.setUpdateTime(LocalDateTime.now());
         return service.updateById(ewater) ? AjaxResult.success(ewater) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AAssetManagementController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 import static com.zksy.utils.util.generateAssetNumber;
@@ -62,7 +64,7 @@ public class AAssetManagementController {
     @PostMapping("/update")
     @ApiOperation(value = "资产信息管理信息修改")
     public AjaxResult update(@RequestBody AAssetManagement aassetManagement) {
-        aassetManagement.setUpdateTime(new DateTime());
+        aassetManagement.setUpdateTime(LocalDateTime.now());
         return service.updateById(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AContractInfoController.java

@@ -0,0 +1,69 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AAssetManagement;
+import com.zksy.property.domain.AContractInfo;
+import com.zksy.property.service.AAssetManagementService;
+import com.zksy.property.service.AContractInfoService;
+import com.zksy.utils.AjaxResult;
+import com.zksy.utils.ExcelExportUtil;
+import com.zksy.utils.ExcelImportUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+import static com.zksy.utils.util.generateAssetNumber;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 合同信息控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/acontractInfo")
+@Api(tags = "合同信息",description = "合同信息desc")
+public class AContractInfoController {
+    @Autowired
+    private AContractInfoService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "合同信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String contractNumber,String contractDate,String contractStatus){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, contractNumber,contractDate,contractStatus));
+    }
+    @GetMapping("/getAContractInfoList")
+    @ApiOperation(value = "合同信息查询")
+    public AjaxResult getAContractInfoList(String contractNumber,String contractDate,String contractStatus){
+        return AjaxResult.success(service.getAContractInfoList(contractNumber,contractDate,contractStatus));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询合同信息")
+    public AjaxResult getById(@PathVariable String id){
+        return AjaxResult.success(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "合同信息保存")
+    public AjaxResult save(@RequestBody AContractInfo entity) {
+        return service.save(entity) ? AjaxResult.success(entity) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "合同信息修改")
+    public AjaxResult update(@RequestBody AContractInfo entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "合同信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+
+}

src/main/java/com/zksy/controller/property/ADeviceInfoController.java

@@ -0,0 +1,63 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AContractInfo;
+import com.zksy.property.domain.ADeviceInfo;
+import com.zksy.property.service.AContractInfoService;
+import com.zksy.property.service.ADeviceInfoService;
+import com.zksy.utils.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 设备信息控制层
+ * @date 2025/6/24 14:33:13
+ */
+
+@RestController
+@RequestMapping("/adeviceInfo")
+@Api(tags = "设备信息",description = "设备信息desc")
+public class ADeviceInfoController {
+    @Autowired
+    private ADeviceInfoService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "设备信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String deviceName,String deviceType,String deviceNumber){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, deviceName,deviceType,deviceNumber));
+    }
+    @GetMapping("/getADeviceInfoList")
+    @ApiOperation(value = "设备信息查询")
+    public AjaxResult getADeviceInfoList(String deviceName,String deviceType,String deviceNumber){
+        return AjaxResult.success(service.getADeviceInfoList(deviceName,deviceType,deviceNumber));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询设备信息")
+    public AjaxResult getById(@PathVariable String id){
+        return AjaxResult.success(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "设备信息保存")
+    public AjaxResult save(@RequestBody ADeviceInfo entity) {
+        return service.save(entity) ? AjaxResult.success(entity) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "设备信息修改")
+    public AjaxResult update(@RequestBody ADeviceInfo entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "设备信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+
+}

src/main/java/com/zksy/controller/property/AEquipmentLedgerController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -51,7 +53,7 @@ public class AEquipmentLedgerController {
     @PostMapping("/update")
     @ApiOperation(value = "设备台账修改")
     public AjaxResult update(@RequestBody AEquipmentLedger aassetManagement) {
-        aassetManagement.setUpdateTime(new DateTime());
+        aassetManagement.setUpdateTime(LocalDateTime.now());
         return service.updateById(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AEquipmentManagementController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class AEquipmentManagementController {
     @PostMapping("/update")
     @ApiOperation(value = "资产附属设施管理修改")
     public AjaxResult update(@RequestBody AEquipmentManagement aequipmentManagement) {
-        aequipmentManagement.setUpdateTime(new DateTime());
+        aequipmentManagement.setUpdateTime(LocalDateTime.now());
         return service.updateById(aequipmentManagement) ? AjaxResult.success(aequipmentManagement) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AHouseInfoDetailController.java

@@ -0,0 +1,62 @@
+package com.zksy.controller.property;
+
+import com.zksy.property.domain.ADeviceInfo;
+import com.zksy.property.domain.AHouseInfoDetail;
+import com.zksy.property.service.ADeviceInfoService;
+import com.zksy.property.service.AHouseInfoDetailService;
+import com.zksy.utils.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 房屋详细信息控制层
+ * @date 2025/6/24 14:33:13
+ */
+
+@RestController
+@RequestMapping("/ahouseInfoDetail")
+@Api(tags = "房屋详细信息",description = "房屋详细信息desc")
+public class AHouseInfoDetailController {
+    @Autowired
+    private AHouseInfoDetailService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "房屋详细信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String area,String introduce,String houseType){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, area,introduce,houseType));
+    }
+    @GetMapping("/getAHouseInfoDetailList")
+    @ApiOperation(value = "房屋详细信息查询")
+    public AjaxResult getAHouseInfoDetailList(String area,String introduce,String houseType){
+        return AjaxResult.success(service.getAHouseInfoDetailList(area,introduce,houseType));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询房屋详细信息")
+    public AjaxResult getById(@PathVariable String id){
+        return AjaxResult.success(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "房屋详细信息保存")
+    public AjaxResult save(@RequestBody AHouseInfoDetail entity) {
+        return service.save(entity) ? AjaxResult.success(entity) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "房屋详细信息修改")
+    public AjaxResult update(@RequestBody AHouseInfoDetail entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "房屋详细信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+
+}

src/main/java/com/zksy/controller/property/AHouseTypeController.java

@@ -1,6 +1,7 @@
 package com.zksy.controller.property;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import com.zksy.property.domain.AHouseType;
 import com.zksy.property.service.AHouseTypeService;
 import com.zksy.utils.AjaxResult;
@@ -10,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -48,7 +51,7 @@ public class AHouseTypeController {
     @PostMapping("/update")
     @ApiOperation(value = "户型修改")
     public AjaxResult update(AHouseType houseType, MultipartFile multipartFile) {
-        houseType.setUpdateTime(new DateTime());
+        houseType.setUpdateTime(LocalDateTime.now());
         return service.updateHouseType(houseType, multipartFile)? AjaxResult.success(houseType): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AInnovationController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class AInnovationController {
     @PostMapping("/update")
     @ApiOperation(value = "创新创业收入情况信息修改")
     public AjaxResult update(@RequestBody AInnovation ainnovation) {
-        ainnovation.setUpdateTime(new DateTime());
+        ainnovation.setUpdateTime(LocalDateTime.now());
         return service.updateById(ainnovation) ? AjaxResult.success(ainnovation) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AMaintenanceController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class AMaintenanceController {
     @PostMapping("/update")
     @ApiOperation(value = "维修管理信息修改")
     public AjaxResult update(@RequestBody AMaintenance amaintenance) {
-        amaintenance.setUpdateTime(new DateTime());
+        amaintenance.setUpdateTime(LocalDateTime.now());
         return service.updateById(amaintenance) ? AjaxResult.success(amaintenance) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/AMaintenanceRecordsController.java

@@ -0,0 +1,62 @@
+package com.zksy.controller.property;
+
+import com.zksy.property.domain.AHouseInfoDetail;
+import com.zksy.property.domain.AMaintenanceRecords;
+import com.zksy.property.service.AHouseInfoDetailService;
+import com.zksy.property.service.AMaintenanceRecordsService;
+import com.zksy.utils.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 维护记录控制层
+ * @date 2025/6/24 14:33:13
+ */
+
+@RestController
+@RequestMapping("/amaintenanceRecords")
+@Api(tags = "维护记录",description = "维护记录desc")
+public class AMaintenanceRecordsController {
+    @Autowired
+    private AMaintenanceRecordsService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "维护记录查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String maintenanceDate,String maintenanceContent,String maintenanceType){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, maintenanceDate,maintenanceContent,maintenanceType));
+    }
+    @GetMapping("/getAMaintenanceRecordsList")
+    @ApiOperation(value = "维护记录查询")
+    public AjaxResult getAMaintenanceRecordsList(String maintenanceDate,String maintenanceContent,String maintenanceType){
+        return AjaxResult.success(service.getAMaintenanceRecordsList(maintenanceDate,maintenanceContent,maintenanceType));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询维护记录")
+    public AjaxResult getById(@PathVariable String id){
+        return AjaxResult.success(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "维护记录保存")
+    public AjaxResult save(@RequestBody AMaintenanceRecords entity) {
+        return service.save(entity) ? AjaxResult.success(entity) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "维护记录修改")
+    public AjaxResult update(@RequestBody AMaintenanceRecords entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "维护记录删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+
+}

src/main/java/com/zksy/controller/property/APropertyReceiptController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class APropertyReceiptController {
     @PostMapping("/update")
     @ApiOperation(value = "标准化厂房收入情况信息修改")
     public AjaxResult update(@RequestBody APropertyReceipt eAdminLicenseInfo) {
-        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        eAdminLicenseInfo.setUpdateTime(LocalDateTime.now());
         return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/APublicRentalHousingController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class APublicRentalHousingController {
     @PostMapping("/update")
     @ApiOperation(value = "公租房租金收入情况修改")
     public AjaxResult update(@RequestBody APublicRentalHousing eAdminLicenseInfo) {
-        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        eAdminLicenseInfo.setUpdateTime(LocalDateTime.now());
         return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/ARentalContractController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -51,7 +53,7 @@ public class ARentalContractController {
     @PostMapping("/update")
     @ApiOperation(value = "租赁合同管理修改")
     public AjaxResult update(@RequestBody ARentalContract aassetManagement) {
-        aassetManagement.setUpdateTime(new DateTime());
+        aassetManagement.setUpdateTime(LocalDateTime.now());
         return service.updateById(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/ARentalPropertyController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class ARentalPropertyController {
     @PostMapping("/update")
     @ApiOperation(value = "公租房租赁情况信息修改")
     public AjaxResult update(@RequestBody ARentalProperty arentalProperty) {
-        arentalProperty.setUpdateTime(new DateTime());
+        arentalProperty.setUpdateTime(LocalDateTime.now());
         return service.updateById(arentalProperty) ? AjaxResult.success(arentalProperty) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/ARoomController.java

@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -38,12 +40,12 @@ public class ARoomController {
     @PostMapping("/update")
     @ApiOperation(value = "房间修改")
     public AjaxResult update(ARoom aRoom, MultipartFile multipartFile) {
-        aRoom.setUpdateTime(new DateTime());
+        aRoom.setUpdateTime(LocalDateTime.now());
         return service.updateARoom(aRoom,multipartFile)? AjaxResult.success(aRoom): AjaxResult.error("修改失败");
     }
     @PostMapping("/updateBatch")
     @ApiOperation(value = "房间批量修改按钮属性")
-    public AjaxResult updateBatch(List<ARoom> aRoomList) {
+    public AjaxResult updateBatch(@RequestBody List<ARoom> aRoomList) {
         return service.updateBatchById(aRoomList)? AjaxResult.success(aRoomList): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/controller/property/ASimplifiedHouseInfoController.java

@@ -0,0 +1,62 @@
+package com.zksy.controller.property;
+
+import com.zksy.property.domain.AMaintenanceRecords;
+import com.zksy.property.domain.ASimplifiedHouseInfo;
+import com.zksy.property.service.AMaintenanceRecordsService;
+import com.zksy.property.service.ASimplifiedHouseInfoService;
+import com.zksy.utils.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 房屋信息控制层
+ * @date 2025/6/24 14:33:13
+ */
+
+@RestController
+@RequestMapping("/asimplifiedHouseInfo")
+@Api(tags = "房屋信息",description = "房屋信息desc")
+public class ASimplifiedHouseInfoController {
+    @Autowired
+    private ASimplifiedHouseInfoService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "房屋信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String assetType,String building,String houseName,String status){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, assetType,building,houseName, status));
+    }
+    @GetMapping("/getASimplifiedHouseInfoList")
+    @ApiOperation(value = "房屋信息查询")
+    public AjaxResult getASimplifiedHouseInfoList(String assetType,String building,String houseName,String status){
+        return AjaxResult.success(service.getASimplifiedHouseInfoList(assetType,building,houseName, status));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询房屋信息")
+    public AjaxResult getById(@PathVariable String id){
+        return AjaxResult.success(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "房屋信息保存")
+    public AjaxResult save(@RequestBody ASimplifiedHouseInfo entity) {
+        return service.save(entity) ? AjaxResult.success(entity) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "房屋信息修改")
+    public AjaxResult update(@RequestBody ASimplifiedHouseInfo entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "房屋信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+
+}

src/main/java/com/zksy/controller/property/ATenantInfoController.java

@@ -0,0 +1,62 @@
+package com.zksy.controller.property;
+
+import com.zksy.property.domain.ASimplifiedHouseInfo;
+import com.zksy.property.domain.ATenantInfo;
+import com.zksy.property.service.ASimplifiedHouseInfoService;
+import com.zksy.property.service.ATenantInfoService;
+import com.zksy.utils.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 租户信息控制层
+ * @date 2025/6/24 14:33:13
+ */
+
+@RestController
+@RequestMapping("/atenantInfo")
+@Api(tags = "租户信息",description = "租户信息desc")
+public class ATenantInfoController {
+    @Autowired
+    private ATenantInfoService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "租户信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String tenantName,String tenantIdCard,String tenantInDate){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, tenantName,tenantIdCard,tenantInDate));
+    }
+    @GetMapping("/getATenantInfoList")
+    @ApiOperation(value = "租户信息查询")
+    public AjaxResult getATenantInfoList(String tenantName,String tenantIdCard,String tenantInDate){
+        return AjaxResult.success(service.getATenantInfoList(tenantName,tenantIdCard,tenantInDate));
+    }
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询租户信息")
+    public AjaxResult getById(@PathVariable String id){
+        return AjaxResult.success(service.getById(id));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "租户信息保存")
+    public AjaxResult save(@RequestBody ATenantInfo entity) {
+        return service.save(entity) ? AjaxResult.success(entity) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "租户信息修改")
+    public AjaxResult update(@RequestBody ATenantInfo entity) {
+        entity.setUpdateTime(LocalDateTime.now());
+        return service.updateById(entity) ? AjaxResult.success(entity) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "租户信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+
+}

src/main/java/com/zksy/controller/property/ATenantManagementController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 /**
@@ -53,7 +55,7 @@ public class ATenantManagementController {
     @PostMapping("/update")
     @ApiOperation(value = "租户信息管理信息修改")
     public AjaxResult update(@RequestBody ATenantManagement atenantManagement) {
-        atenantManagement.setUpdateTime(new DateTime());
+        atenantManagement.setUpdateTime(LocalDateTime.now());
         return service.updateById(atenantManagement) ? AjaxResult.success(atenantManagement) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

src/main/java/com/zksy/info/domain/EAdminLicenseInfo.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -141,7 +143,7 @@ public class EAdminLicenseInfo implements Serializable {
     @ExcelProperty(value = "许可决定日期",index = 15)
     @DateTimeFormat(value = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date licenseDecisionDate;
+    private LocalDate licenseDecisionDate;
 
     /**
      * 有效期自
@@ -150,7 +152,7 @@ public class EAdminLicenseInfo implements Serializable {
     @ExcelProperty(value = "有效期自",index = 16)
     @DateTimeFormat(value = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date validFrom;
+    private LocalDate validFrom;
 
     /**
      * 有效期至
@@ -159,7 +161,7 @@ public class EAdminLicenseInfo implements Serializable {
     @ExcelProperty(value = "有效期至",index = 17)
     @DateTimeFormat(value = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date validTo;
+    private LocalDate validTo;
 
     /**
      * 许可机关
@@ -195,7 +197,7 @@ public class EAdminLicenseInfo implements Serializable {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -210,7 +212,7 @@ public class EAdminLicenseInfo implements Serializable {
     @ExcelIgnore
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EArchivesAdministration.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -62,7 +64,7 @@ public class EArchivesAdministration implements Serializable {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -77,7 +79,7 @@ public class EArchivesAdministration implements Serializable {
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EContactManagement.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -47,7 +49,7 @@ public class EContactManagement implements Serializable {
     @ApiModelProperty("出生日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "出生日期")
-    private Date contactBirthday;
+    private LocalDate contactBirthday;
 
     /**
      * 手机号码
@@ -97,7 +99,7 @@ public class EContactManagement implements Serializable {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -112,7 +114,7 @@ public class EContactManagement implements Serializable {
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EEmployeeBenefit.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,7 +58,7 @@ public class EEmployeeBenefit implements Serializable {
     @ApiModelProperty("福利所属年月")
     @ExcelProperty(value = "福利所属年月")
     @JsonFormat(pattern = "yyyy-MM")
-    private Date benefitYearMonth;
+    private LocalDate benefitYearMonth;
 
     /**
      * 福利金额
@@ -78,7 +80,7 @@ public class EEmployeeBenefit implements Serializable {
     @ApiModelProperty("实际发放日期")
     @ExcelProperty(value = "实际发放日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date issueDate;
+    private LocalDate issueDate;
 
     /**
      * 领取人
@@ -100,7 +102,7 @@ public class EEmployeeBenefit implements Serializable {
     @ApiModelProperty("记录创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 记录最后更新时间
@@ -108,7 +110,7 @@ public class EEmployeeBenefit implements Serializable {
     @ApiModelProperty("记录最后更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EEmployeeInfo.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -55,7 +57,7 @@ public class EEmployeeInfo implements Serializable {
     @ApiModelProperty("出生日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "出生日期",index = 3)
-    private Date dateOfBirth;
+    private LocalDate dateOfBirth;
 
     /**
      * 身份证号
@@ -118,7 +120,7 @@ public class EEmployeeInfo implements Serializable {
     @ApiModelProperty("入职日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "入职日期",index = 11)
-    private Date hireDate;
+    private LocalDate hireDate;
 
     /**
      * 合同到期日期
@@ -126,7 +128,7 @@ public class EEmployeeInfo implements Serializable {
     @ApiModelProperty("合同到期日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "合同到期日期",index = 12)
-    private Date contractExpiryDate;
+    private LocalDate contractExpiryDate;
 
     /**
      * 创建时间
@@ -134,7 +136,7 @@ public class EEmployeeInfo implements Serializable {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -149,7 +151,7 @@ public class EEmployeeInfo implements Serializable {
     @ExcelIgnore
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EEmployeeMaster.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +51,7 @@ public class EEmployeeMaster implements Serializable {
     @ExcelProperty(value = "入职日期")
     @ApiModelProperty(value = "入职日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date hireDate;
+    private LocalDate hireDate;
 
     /**
      * 离职日期
@@ -57,7 +59,7 @@ public class EEmployeeMaster implements Serializable {
     @ExcelProperty(value = "离职日期")
     @ApiModelProperty(value = "离职日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date terminationDate;
+    private LocalDate terminationDate;
 
     /**
      * 联系电话
@@ -86,7 +88,7 @@ public class EEmployeeMaster implements Serializable {
     @ExcelProperty(value = "合同开始日期")
     @ApiModelProperty(value = "合同开始日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date contractStartDate;
+    private LocalDate contractStartDate;
 
     /**
      * 合同结束日期
@@ -94,7 +96,7 @@ public class EEmployeeMaster implements Serializable {
     @ExcelProperty(value = "合同结束日期")
     @ApiModelProperty(value = "合同结束日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date contractEndDate;
+    private LocalDate contractEndDate;
 
     /**
      * 合同状态
@@ -116,7 +118,7 @@ public class EEmployeeMaster implements Serializable {
     @ExcelIgnore
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
@@ -124,7 +126,7 @@ public class EEmployeeMaster implements Serializable {
     @ExcelIgnore
     @ApiModelProperty(value = "更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/zksy/info/domain/EEmployeeSalary.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -140,7 +142,7 @@ public class EEmployeeSalary implements Serializable {
     @ApiModelProperty("实际发放日期")
     @ExcelProperty(value = "实际发放日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date paymentDate;
+    private LocalDate paymentDate;
 
     /**
      * 薪资计算备注
@@ -161,7 +163,7 @@ public class EEmployeeSalary implements Serializable {
     @ApiModelProperty("记录创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 记录最后更新时间
@@ -169,7 +171,7 @@ public class EEmployeeSalary implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
     @ApiModelProperty("记录最后更新时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EEnterpriseElectricityAnnualStatistics.java

@@ -1,5 +1,6 @@
 package com.zksy.info.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,8 +8,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -24,6 +28,7 @@ public class EEnterpriseElectricityAnnualStatistics implements Serializable {
      */
     @ApiModelProperty("主键")
     @TableId(type = IdType.ASSIGN_UUID)
+    @ExcelIgnore
     private String id;
 
     /**
@@ -52,7 +57,8 @@ public class EEnterpriseElectricityAnnualStatistics implements Serializable {
      */
     @ApiModelProperty("开户日期")
     @ExcelProperty("开户日期")
-    private Date openingDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate openingDate;
 
     /**
      * 年度
@@ -135,13 +141,17 @@ public class EEnterpriseElectricityAnnualStatistics implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
     @ApiModelProperty("更新时间")
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/zksy/info/domain/EEnterpriseGasAnnualStatistics.java

@@ -1,5 +1,6 @@
 package com.zksy.info.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,8 +8,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,6 +27,8 @@ public class EEnterpriseGasAnnualStatistics implements Serializable {
      * 主键
      */
     @TableId(type = IdType.ASSIGN_UUID)
+    @ExcelIgnore
+    @ApiModelProperty("主键")
     private String id;
 
     /**
@@ -51,7 +57,8 @@ public class EEnterpriseGasAnnualStatistics implements Serializable {
      */
     @ApiModelProperty("开户日期")
     @ExcelProperty("开户日期")
-    private Date openingDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate openingDate;
 
     /**
      * 年度
@@ -134,13 +141,17 @@ public class EEnterpriseGasAnnualStatistics implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
     @ApiModelProperty("更新时间")
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/zksy/info/domain/EEnterpriseInfo.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import lombok.Data;
 
@@ -87,7 +88,7 @@ public class EEnterpriseInfo implements Serializable {
     @ApiModelProperty(value = "记录创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -102,7 +103,7 @@ public class EEnterpriseInfo implements Serializable {
     @ExcelIgnore
     @ApiModelProperty(value = "记录最后修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EEnterprisePowerInfo.java

@@ -12,6 +12,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import lombok.Data;
 
@@ -79,7 +81,7 @@ public class EEnterprisePowerInfo implements Serializable {
     @ExcelProperty(value = "首次供电时间",index = 6)
     @ApiModelProperty(value = "首次通电日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date firstPowerSupplyDate;
+    private LocalDate firstPowerSupplyDate;
 
     /**
      * 用电账户状态
@@ -158,7 +160,7 @@ public class EEnterprisePowerInfo implements Serializable {
     @DateTimeFormat("yyyy-MM-dd")
     @ApiModelProperty(value = "数据统计日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date statisticsTime;
+    private LocalDate statisticsTime;
 
     /**
      * 统计基准日期
@@ -167,7 +169,7 @@ public class EEnterprisePowerInfo implements Serializable {
     @DateTimeFormat("yyyy-MM-dd")
     @ApiModelProperty(value = "统计数据的截止日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date statisticsBaseDate;
+    private LocalDate statisticsBaseDate;
 
     /**
      * 备注
@@ -189,7 +191,7 @@ public class EEnterprisePowerInfo implements Serializable {
     @ExcelIgnore
     @ApiModelProperty(value = "记录创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -204,7 +206,7 @@ public class EEnterprisePowerInfo implements Serializable {
     @ExcelIgnore
     @ApiModelProperty(value = "记录最后修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EEnterpriseWaterAnnualStatistics.java

@@ -1,5 +1,6 @@
 package com.zksy.info.domain;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,8 +8,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -24,6 +28,7 @@ public class EEnterpriseWaterAnnualStatistics implements Serializable {
      */
     @TableId(type = IdType.ASSIGN_UUID)
     @ApiModelProperty("主键")
+    @ExcelIgnore
     private String id;
 
     /**
@@ -52,7 +57,8 @@ public class EEnterpriseWaterAnnualStatistics implements Serializable {
      */
     @ApiModelProperty("开户日期")
     @ExcelProperty("开户日期")
-    private Date openingDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate openingDate;
 
     /**
      * 年度
@@ -135,13 +141,17 @@ public class EEnterpriseWaterAnnualStatistics implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
+    private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
     @ApiModelProperty("更新时间")
-    private Date updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ExcelIgnore
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/zksy/info/domain/EGas.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -105,7 +107,7 @@ public class EGas implements Serializable {
     @ExcelProperty(value = "开户日期")
     @ApiModelProperty("开户日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date openDate;
+    private LocalDate openDate;
 
     /**
      * 用户地址
@@ -162,7 +164,7 @@ public class EGas implements Serializable {
     @ExcelIgnore
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建用户
@@ -177,7 +179,7 @@ public class EGas implements Serializable {
     @ExcelIgnore
     @ApiModelProperty("更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 更新用户

src/main/java/com/zksy/info/domain/EQualificationCertificate.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -48,7 +50,7 @@ public class EQualificationCertificate implements Serializable {
     @ApiModelProperty("发证日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "发证日期",index = 2)
-    private Date certificateIssuanceDate;
+    private LocalDate certificateIssuanceDate;
 
     /**
      * 证书类型
@@ -77,7 +79,7 @@ public class EQualificationCertificate implements Serializable {
     @ApiModelProperty("截止日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "截止日期",index = 6)
-    private Date deadlineDate;
+    private LocalDate deadlineDate;
 
     /**
      * 记录创建时间
@@ -85,7 +87,7 @@ public class EQualificationCertificate implements Serializable {
     @ApiModelProperty("记录创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 记录最后更新时间
@@ -93,7 +95,7 @@ public class EQualificationCertificate implements Serializable {
     @ApiModelProperty("记录最后更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EQuarterlyElectricityBill.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -104,7 +106,7 @@ public class EQuarterlyElectricityBill implements Serializable {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -119,7 +121,7 @@ public class EQuarterlyElectricityBill implements Serializable {
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/info/domain/EQuarterlyWaterUsage.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -97,7 +99,7 @@ public class EQuarterlyWaterUsage implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
     @ApiModelProperty(value = "创建时间", position = 11)
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -112,7 +114,7 @@ public class EQuarterlyWaterUsage implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
     @ApiModelProperty(value = "修改时间", position = 13)
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/AAssetManagement.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -75,7 +77,7 @@ public class AAssetManagement implements Serializable {
      */
     @ApiModelProperty(value = "创建时间")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -89,7 +91,7 @@ public class AAssetManagement implements Serializable {
      */
     @ApiModelProperty(value = "修改时间")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/AEquipmentLedger.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,7 +77,7 @@ public class AEquipmentLedger implements Serializable {
     @ApiModelProperty(value = "出厂日期")
     @ExcelProperty(value = "出厂日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date productionDate;
+    private LocalDate productionDate;
 
     /**
      * 购置日期
@@ -83,7 +85,7 @@ public class AEquipmentLedger implements Serializable {
     @ApiModelProperty(value = "购置日期")
     @ExcelProperty(value = "购置日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date purchaseDate;
+    private LocalDate purchaseDate;
 
     /**
      * 使用部门
@@ -139,7 +141,7 @@ public class AEquipmentLedger implements Serializable {
      */
     @ApiModelProperty(value = "创建时间")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建用户
@@ -153,7 +155,7 @@ public class AEquipmentLedger implements Serializable {
      */
     @ApiModelProperty(value = "更新时间")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 更新用户

src/main/java/com/zksy/property/domain/AEquipmentManagement.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -84,7 +86,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "采购日期")
     @ExcelProperty(value = "采购日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date purchaseDate;
+    private LocalDate purchaseDate;
 
     /**
      * 采购价格
@@ -99,7 +101,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "安装启用日期")
     @ExcelProperty(value = "安装启用日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date installationDate;
+    private LocalDate installationDate;
 
     /**
      * 安装位置
@@ -128,7 +130,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "质保到期日")
     @ExcelProperty(value = "质保到期日")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date warrantyEndDate;
+    private LocalDate warrantyEndDate;
 
     /**
      * 维护周期（月）
@@ -150,7 +152,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "上次维护日期")
     @ExcelProperty(value = "上次维护日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastMaintenanceDate;
+    private LocalDate lastMaintenanceDate;
 
     /**
      * 下次维护提醒日期
@@ -158,7 +160,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "下次维护提醒日期")
     @ExcelProperty(value = "下次维护提醒日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date nextMaintenanceDate;
+    private LocalDate nextMaintenanceDate;
 
     /**
      * 累计维护费用
@@ -187,7 +189,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "记录创建时间")
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
     /**
      * 记录创建人
      */
@@ -201,7 +203,7 @@ public class AEquipmentManagement implements Serializable {
     @ApiModelProperty(value = "最后更新时间")
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
     /**
      * 最后更新人
      */

src/main/java/com/zksy/property/domain/AHouseType.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -63,7 +65,7 @@ public class AHouseType implements Serializable {
      */
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -76,7 +78,7 @@ public class AHouseType implements Serializable {
      */
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/AInnovation.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,7 +58,7 @@ public class AInnovation implements Serializable {
     @ApiModelProperty(value = "收取时间")
     @ExcelProperty(value = "收取时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date collectionTime;
+    private LocalDate collectionTime;
 
     /**
      * 房租
@@ -119,7 +121,7 @@ public class AInnovation implements Serializable {
      */
     @ApiModelProperty(value = "创建时间")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -133,7 +135,7 @@ public class AInnovation implements Serializable {
      */
     @ApiModelProperty(value = "修改时间")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/AMaintenance.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -98,7 +100,7 @@ public class AMaintenance implements Serializable {
     @ApiModelProperty(value = "报修提交时间")
     @ExcelProperty(value = "报修提交时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date submitTime;
+    private LocalDate submitTime;
 
     /**
      * 维修人员
@@ -113,7 +115,7 @@ public class AMaintenance implements Serializable {
     @ApiModelProperty(value = "维修开始时间")
     @ExcelProperty(value = "维修开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
+    private LocalDate startTime;
 
     /**
      * 维修完成时间
@@ -121,7 +123,7 @@ public class AMaintenance implements Serializable {
     @ApiModelProperty(value = "维修完成时间")
     @ExcelProperty(value = "维修完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date finishTime;
+    private LocalDate finishTime;
 
     /**
      * 任务状态
@@ -149,7 +151,7 @@ public class AMaintenance implements Serializable {
      */
     @ApiModelProperty(value = "创建时间")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -163,7 +165,7 @@ public class AMaintenance implements Serializable {
      */
     @ApiModelProperty(value = "最后更新时间")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/APropertyReceipt.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,7 +58,7 @@ public class APropertyReceipt implements Serializable {
     @ExcelProperty(value = "收取时间")
     @ApiModelProperty("收取时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date collectionTime;
+    private LocalDate collectionTime;
 
     /**
      * 房租
@@ -120,7 +122,7 @@ public class APropertyReceipt implements Serializable {
     @ExcelIgnore
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 修改时间
@@ -128,7 +130,7 @@ public class APropertyReceipt implements Serializable {
     @ExcelIgnore
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/zksy/property/domain/APublicRentalHousing.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -56,7 +58,7 @@ public class APublicRentalHousing implements Serializable {
     @ApiModelProperty("收取时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "收取时间")
-    private Date collectionTime;
+    private LocalDate collectionTime;
 
     /**
      * 房租
@@ -120,7 +122,7 @@ public class APublicRentalHousing implements Serializable {
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -135,7 +137,7 @@ public class APublicRentalHousing implements Serializable {
     @ApiModelProperty("修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/ARentalContract.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -61,14 +63,14 @@ public class ARentalContract implements Serializable {
      */
     @ApiModelProperty(value = "租赁起始日期")
     @ExcelProperty(value = "租赁起始日期")
-    private Date leaseStartDate;
+    private LocalDate leaseStartDate;
 
     /**
      * 租赁结束日期
      */
     @ApiModelProperty(value = "租赁结束日期")
     @ExcelProperty(value = "租赁结束日期")
-    private Date leaseEndDate;
+    private LocalDate leaseEndDate;
 
     /**
      * 月租金金额
@@ -103,14 +105,14 @@ public class ARentalContract implements Serializable {
      */
     @ApiModelProperty(value = "合同创建时间")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 合同最后更新时间
      */
     @ApiModelProperty(value = "合同最后更新时间")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 创建人账号

src/main/java/com/zksy/property/domain/ARentalProperty.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -112,7 +114,7 @@ public class ARentalProperty implements Serializable {
     @ApiModelProperty("创建时间")
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -127,7 +129,7 @@ public class ARentalProperty implements Serializable {
     @ApiModelProperty("修改时间")
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/ARoom.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -51,7 +53,7 @@ public class ARoom implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人
@@ -63,7 +65,7 @@ public class ARoom implements Serializable {
      * 修改时间
      */
     @ApiModelProperty("修改时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 修改人

src/main/java/com/zksy/property/domain/ATenantManagement.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -89,14 +91,14 @@ public class ATenantManagement implements Serializable {
      */
     @ApiModelProperty(value = "租赁开始日期")
     @ExcelProperty(value = "租赁开始日期")
-    private Date leaseStart;
+    private LocalDate leaseStart;
 
     /**
      * 租赁结束日期
      */
     @ApiModelProperty(value = "租赁结束日期")
     @ExcelProperty(value = "租赁结束日期")
-    private Date leaseEnd;
+    private LocalDate leaseEnd;
 
     /**
      * 月租金金额
@@ -166,7 +168,7 @@ public class ATenantManagement implements Serializable {
      */
     @ApiModelProperty(value = "最后支付日期")
     @ExcelProperty(value = "最后支付日期")
-    private Date lastPaymentDate;
+    private LocalDate lastPaymentDate;
 
     /**
      * 租户状态(1 = 入住中，2 = 已退房，3 = 违约，4 = 待入)
@@ -180,7 +182,7 @@ public class ATenantManagement implements Serializable {
      */
     @ApiModelProperty(value = "退房日期")
     @ExcelProperty(value = "退房日期")
-    private Date moveOutDate;
+    private LocalDate moveOutDate;
 
     /**
      * 违约记录
@@ -194,7 +196,7 @@ public class ATenantManagement implements Serializable {
      */
     @ApiModelProperty(value = "记录创建时间")
     @ExcelIgnore
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /**
      * 创建人账号
@@ -208,7 +210,7 @@ public class ATenantManagement implements Serializable {
      */
     @ApiModelProperty(value = "最后更新时间")
     @ExcelIgnore
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /**
      * 最后更新人账号

src/main/java/com/zksy/property/domain/vo/HouseInfoVo.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 public class HouseInfoVo {
     private String houseName;//房间名称 (A栋101)
     private String address;//地址
-    private Boolean status ;//状态 (未租/已租)
+    private String status ;//状态 (未租/已租)
     private String rentRange ;//租金范围
 
     @Data

src/main/resources/application-dev.yml

@@ -48,4 +48,8 @@ knife4j:
         group-name: default
         api-rule: package
         api-rule-resources:
-          - com.zksy.controller
+          - com.zksy.controller
+logging:
+  level:
+    root: debug  # 设置全局日志级别为debug
+    com.zksy: debug  # 设置特定包的日志级别为debug