feat(property): 添加物业相关控制器和功能

- 新增 AAssetManagementController、AEquipmentLedgerController、AEquipmentManagementController、AInnovationController、AMaintenanceController、ARentalContractController 等控制器
- 实现了资产信息管理、设备台账、资产附属设施管理、创新创业收入情况、维修管理、租赁合同管理等功能
- 优化了现有的 AHouseTypeController、APropertyReceiptController、APublicRentalHousingController、ARentalPropertyController、ARoomController 控制器
-修复了 ARoomServiceImpl 中的查询逻辑

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EAdminLicenseInfo;
 import com.zksy.info.domain.EEnterprisePowerInfo;
 import com.zksy.info.service.EAdminLicenseInfoService;
@@ -39,7 +40,7 @@ public class EAdminLicenseInfoController {
     public AjaxResult getEAdminLicenseInfoList(String licenseCertificateName,String licenseNumber,String currentStatus){
         return AjaxResult.success(service.getEAdminLicenseInfoList(licenseCertificateName,licenseNumber,currentStatus));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询行政许可信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,28 @@ public class EAdminLicenseInfoController {
     @PostMapping("/save")
     @ApiOperation(value = "行政许可信息保存")
     public AjaxResult save(@RequestBody EAdminLicenseInfo eAdminLicenseInfo) {
-        return AjaxResult.success(service.save(eAdminLicenseInfo));
+        return service.save(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo): AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "行政许可信息修改")
     public AjaxResult update(@RequestBody EAdminLicenseInfo eAdminLicenseInfo) {
-        return AjaxResult.success(service.updateById(eAdminLicenseInfo));
+        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "行政许可信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EAdminLicenseInfo.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String licenseCertificateName,String licenseNumber,String currentStatus) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getEAdminLicenseInfoList(licenseCertificateName,licenseNumber,currentStatus), EAdminLicenseInfo.class, "行政许可信息","行政许可信息"));
+    public void exportData(HttpServletResponse response,String licenseCertificateName,String licenseNumber,String currentStatus) {
+        ExcelExportUtil.exportExcel(response,service.getEAdminLicenseInfoList(licenseCertificateName,licenseNumber,currentStatus), EAdminLicenseInfo.class, "行政许可信息","行政许可信息");
     }
 
 }

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

@@ -1,8 +1,7 @@
 package com.zksy.controller.info;
 
-import com.zksy.info.domain.EAdminLicenseInfo;
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EArchivesAdministration;
-import com.zksy.info.service.EAdminLicenseInfoService;
 import com.zksy.info.service.EArchivesAdministrationService;
 import com.zksy.utils.AjaxResult;
 import com.zksy.utils.ExcelExportUtil;
@@ -20,7 +19,7 @@ import java.util.Arrays;
  * @author Administrator
  * @version 1.0
  * @project enterprise-assets-service
- * @description 行政许可控制层
+ * @description 员工档案管理控制层
  * @date 2025/6/24 14:33:13
  */
 @RestController
@@ -39,7 +38,7 @@ public class EArchivesAdministrationController {
     public AjaxResult getEAdminLicenseInfoList(String workNumber,String fullName,String type){
         return AjaxResult.success(service.getEArchivesAdministrationList(workNumber,fullName,type));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询员工档案管理")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,17 +46,28 @@ public class EArchivesAdministrationController {
     @PostMapping("/save")
     @ApiOperation(value = "员工档案管理保存")
     public AjaxResult save(@RequestBody EArchivesAdministration eAdminLicenseInfo) {
-        return AjaxResult.success(service.save(eAdminLicenseInfo));
+        return service.save(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "员工档案管理修改")
     public AjaxResult update(@RequestBody EArchivesAdministration eAdminLicenseInfo) {
-        return AjaxResult.success(service.updateById(eAdminLicenseInfo));
+        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "员工档案管理删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EArchivesAdministration.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String contactName,String contactDepartment,String contactMobile) {
+        ExcelExportUtil.exportExcel(response,service.getEArchivesAdministrationList(contactName,contactDepartment,contactMobile), EArchivesAdministration.class, "员工档案信息","员工档案信息");
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EAdminLicenseInfo;
 import com.zksy.info.domain.EContactManagement;
 import com.zksy.info.service.EAdminLicenseInfoService;
@@ -39,7 +40,7 @@ public class EContactManagementController {
     public AjaxResult getEAdminLicenseInfoList(String contactName,String contactDepartment,String contactMobile){
         return AjaxResult.success(service.getEContactManagementList(contactName,contactDepartment,contactMobile));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询联系人管理信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,28 @@ public class EContactManagementController {
     @PostMapping("/save")
     @ApiOperation(value = "联系人管理信息保存")
     public AjaxResult save(@RequestBody EContactManagement econtactManagement) {
-        return AjaxResult.success(service.save(econtactManagement));
+        return service.save(econtactManagement) ? AjaxResult.success(econtactManagement) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "联系人管理信息修改")
     public AjaxResult update(@RequestBody EContactManagement econtactManagement) {
-        return AjaxResult.success(service.updateById(econtactManagement));
+        econtactManagement.setUpdateTime(new DateTime());
+        return service.updateById(econtactManagement) ? AjaxResult.success(econtactManagement) : AjaxResult.error("更新失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "联系人管理信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EContactManagement.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String contactName,String contactDepartment,String contactMobile) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getEContactManagementList(contactName,contactDepartment,contactMobile), EContactManagement.class, "联系人管理信息","联系人管理信息"));
+    public void exportData(HttpServletResponse response,String contactName,String contactDepartment,String contactMobile) {
+        ExcelExportUtil.exportExcel(response,service.getEContactManagementList(contactName,contactDepartment,contactMobile), EContactManagement.class, "联系人管理信息","联系人管理信息");
     }
 
 }

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

@@ -0,0 +1,74 @@
+package com.zksy.controller.info;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.info.domain.EEmployeeBenefit;
+import com.zksy.info.domain.EEmployeeSalary;
+import com.zksy.info.service.EEmployeeBenefitService;
+import com.zksy.info.service.EEmployeeSalaryService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 员工福利管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/eemployeeBenefit")
+@Api(tags = "员工福利管理控制层",description = "员工福利管理控制层desc")
+public class EEmployeeBenefitController {
+    @Autowired
+    private EEmployeeBenefitService service;
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "员工福利管理查询")
+    public AjaxResult getById(@PathVariable String id) {
+        return AjaxResult.success(service.getById(id));
+    }
+    @GetMapping("/getList")
+    @ApiOperation(value = "员工福利管理查询所有")
+    public AjaxResult getList(String employeeNo,String fullName,String benefitStatus) {
+        return AjaxResult.success(service.getEEmployeeBenefitList(employeeNo, fullName, benefitStatus));
+    }
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "员工福利管理查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String employeeNo,String fullName,String benefitStatus){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, employeeNo, fullName,benefitStatus));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "员工福利管理保存")
+    public AjaxResult save(@RequestBody EEmployeeBenefit eemployeeBenefit) {
+        return service.save(eemployeeBenefit)? AjaxResult.success(eemployeeBenefit): AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "员工福利管理修改")
+    public AjaxResult update(@RequestBody EEmployeeBenefit eemployeeBenefit) {
+        eemployeeBenefit.setUpdateTime(new DateTime());
+        return service.updateById(eemployeeBenefit)? AjaxResult.success(eemployeeBenefit): AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "员工福利管理删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids))? AjaxResult.success("删除成功"): AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EEmployeeBenefit.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response, String employeeNo,String fullName,String benefitStatus) {
+        ExcelExportUtil.exportExcel(response,service.getEEmployeeBenefitList(employeeNo,fullName,benefitStatus), EEmployeeBenefit.class, "员工福利管理","员工福利管理");
+    }
+}

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

@@ -1,16 +1,22 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EEmployeeInfo;
+import com.zksy.info.domain.EEmployeeMaster;
 import com.zksy.info.service.EEmployeeInfoService;
 import com.zksy.property.domain.AHouseType;
 import com.zksy.property.service.AHouseTypeService;
 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;
+
 /**
  * @author Administrator
  * @version 1.0
@@ -24,10 +30,10 @@ import org.springframework.web.multipart.MultipartFile;
 public class EEmployeeInfoController {
     @Autowired
     private EEmployeeInfoService service;
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "员工基本信息查询")
-    public AjaxResult getById(@PathVariable String borrowId) {
-        return AjaxResult.success(service.getById(borrowId));
+    public AjaxResult getById(@PathVariable String id) {
+        return AjaxResult.success(service.getById(id));
     }
     @GetMapping("/getList")
     @ApiOperation(value = "员工基本信息查询所有")
@@ -47,11 +53,22 @@ public class EEmployeeInfoController {
     @PostMapping("/update")
     @ApiOperation(value = "员工基本信息修改")
     public AjaxResult update(@RequestBody EEmployeeInfo eemployeeInfo, MultipartFile multipartFile) {
+        eemployeeInfo.setUpdateTime(new DateTime());
         return service.updateEEmployeeInfo(eemployeeInfo, multipartFile)? AjaxResult.success(eemployeeInfo): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "员工基本信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return service.removeBatchEEmployeeInfo(ids)? AjaxResult.success(): AjaxResult.error("删除失败");
+        return service.removeBatchEEmployeeInfo(ids)? AjaxResult.success("删除成功"): AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EEmployeeInfo.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response, String workNumber,String fullName) {
+         ExcelExportUtil.exportExcel(response,service.getEEmployeeInfoList(workNumber,fullName), EEmployeeInfo.class, "员工基本信息","员工基本信息");
     }
 }

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

@@ -1,15 +1,21 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EArchivesAdministration;
 import com.zksy.info.domain.EEmployeeMaster;
+import com.zksy.info.domain.EEnterpriseInfo;
 import com.zksy.info.service.EArchivesAdministrationService;
 import com.zksy.info.service.EEmployeeMasterService;
 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.util.Arrays;
 
 /**
@@ -27,15 +33,15 @@ public class EEmployeeMasterController {
     private EEmployeeMasterService service;
     @GetMapping("/findByPage")
     @ApiOperation(value = "员工合同管理查询分页")
-    public AjaxResult findByPage(long pageNum, long pageSize,String workNumber,String fullName, String contractNo){
-        return AjaxResult.success(service.findByPage(pageNum, pageSize,workNumber,fullName, contractNo));
+    public AjaxResult findByPage(long pageNum, long pageSize,String contractStatus,String fullName, String contractNo){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize,contractStatus,fullName, contractNo));
     }
     @GetMapping("/getEAdminLicenseInfoList")
     @ApiOperation(value = "员工合同管理查询")
-    public AjaxResult getEAdminLicenseInfoList(String workNumber,String fullName,String contractNo){
-        return AjaxResult.success(service.getEEmployeeMasterList(workNumber,fullName,contractNo));
+    public AjaxResult getEAdminLicenseInfoList(String contractStatus,String fullName,String contractNo){
+        return AjaxResult.success(service.getEEmployeeMasterList(contractStatus,fullName,contractNo));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询员工合同管理")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -43,17 +49,27 @@ public class EEmployeeMasterController {
     @PostMapping("/save")
     @ApiOperation(value = "员工合同管理保存")
     public AjaxResult save(@RequestBody EEmployeeMaster eemployeeMaster) {
-        return AjaxResult.success(service.save(eemployeeMaster));
+        return service.save(eemployeeMaster) ? AjaxResult.success(eemployeeMaster) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "员工合同管理修改")
     public AjaxResult update(@RequestBody EEmployeeMaster eemployeeMaster) {
-        return AjaxResult.success(service.updateById(eemployeeMaster));
+        eemployeeMaster.setUpdateTime(new DateTime());
+        return service.updateById(eemployeeMaster) ? AjaxResult.success(eemployeeMaster) : AjaxResult.error("更新失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "员工合同管理删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EEmployeeMaster.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response, String contractStatus,String fullName,String contractNo) {
+        ExcelExportUtil.exportExcel(response,service.getEEmployeeMasterList(contractStatus,fullName,contractNo), EEmployeeMaster.class, "员工合同信息","员工合同信息");
     }
-
 }

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

@@ -0,0 +1,74 @@
+package com.zksy.controller.info;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.info.domain.EEmployeeInfo;
+import com.zksy.info.domain.EEmployeeSalary;
+import com.zksy.info.service.EEmployeeInfoService;
+import com.zksy.info.service.EEmployeeSalaryService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 员工薪资管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/eemployeeSalary")
+@Api(tags = "员工薪资管理控制层",description = "员工薪资管理控制层desc")
+public class EEmployeeSalaryController {
+    @Autowired
+    private EEmployeeSalaryService service;
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "员工薪资管理查询")
+    public AjaxResult getById(@PathVariable String id) {
+        return AjaxResult.success(service.getById(id));
+    }
+    @GetMapping("/getList")
+    @ApiOperation(value = "员工薪资管理查询所有")
+    public AjaxResult getList(String employeeNo,String fullName,String salaryStatus) {
+        return AjaxResult.success(service.getEEmployeeSalaryList(employeeNo, fullName, salaryStatus));
+    }
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "员工薪资管理查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String employeeNo,String fullName,String salaryStatus){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, employeeNo, fullName,salaryStatus));
+    }
+    @PostMapping("/save")
+    @ApiOperation(value = "员工薪资管理保存")
+    public AjaxResult save(@RequestBody EEmployeeSalary eemployeeSalary) {
+        return service.save(eemployeeSalary)? AjaxResult.success(eemployeeSalary): AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "员工薪资管理修改")
+    public AjaxResult update(@RequestBody EEmployeeSalary eemployeeSalary) {
+        eemployeeSalary.setUpdateTime(new DateTime());
+        return service.updateById(eemployeeSalary)? AjaxResult.success(eemployeeSalary): AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "员工薪资管理删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids))? AjaxResult.success("删除成功"): AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EEmployeeSalary.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response, String employeeNo,String fullName,String salaryStatus) {
+        ExcelExportUtil.exportExcel(response,service.getEEmployeeSalaryList(employeeNo,fullName,salaryStatus), EEmployeeSalary.class, "员工薪资管理","员工薪资管理");
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EEnterpriseInfo;
 import com.zksy.info.service.EEnterpriseInfoService;
 import com.zksy.property.domain.AHouseType;
@@ -39,7 +40,7 @@ public class EEnterpriseInfoController {
     public AjaxResult getEnterpriseInfoList(String enterpriseName){
         return AjaxResult.success(service.getEnterpriseInfoList(enterpriseName));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询企业基本信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,28 @@ public class EEnterpriseInfoController {
     @PostMapping("/save")
     @ApiOperation(value = "企业基本信息保存")
     public AjaxResult save(@RequestBody  EEnterpriseInfo houseType) {
-        return AjaxResult.success(service.save(houseType));
+        return service.save(houseType) ? AjaxResult.success(houseType) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "企业基本信息修改")
     public AjaxResult update(@RequestBody  EEnterpriseInfo houseType) {
-        return AjaxResult.success(service.updateById(houseType));
+        houseType.setUpdateTime(new DateTime());
+        return service.updateById(houseType) ? AjaxResult.success(houseType) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "企业基本信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EEnterpriseInfo.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String enterpriseName) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getEnterpriseInfoList(enterpriseName), EEnterpriseInfo.class, "企业基本信息","企业基本信息"));
+    public void exportData(HttpServletResponse response,String enterpriseName) {
+        ExcelExportUtil.exportExcel(response,service.getEnterpriseInfoList(enterpriseName), EEnterpriseInfo.class, "企业基本信息","企业基本信息");
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EEnterpriseInfo;
 import com.zksy.info.domain.EEnterprisePowerInfo;
 import com.zksy.info.service.EEnterpriseInfoService;
@@ -39,7 +40,7 @@ public class EEnterprisePowerInfoController {
     public AjaxResult getEnterpriseInfoList(String enterpriseName){
         return AjaxResult.success(service.getEEnterprisePowerInfoList(enterpriseName));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询企业用电信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,28 @@ public class EEnterprisePowerInfoController {
     @PostMapping("/save")
     @ApiOperation(value = "企业用电信息保存")
     public AjaxResult save(@RequestBody EEnterprisePowerInfo eEnterprisePowerInfo) {
-        return AjaxResult.success(service.save(eEnterprisePowerInfo));
+        return service.save(eEnterprisePowerInfo) ? AjaxResult.success(eEnterprisePowerInfo) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "企业用电信息修改")
     public AjaxResult update(@RequestBody EEnterprisePowerInfo eEnterprisePowerInfo) {
-        return AjaxResult.success(service.updateById(eEnterprisePowerInfo));
+        eEnterprisePowerInfo.setUpdateTime(new DateTime());
+        return service.updateById(eEnterprisePowerInfo) ? AjaxResult.success(eEnterprisePowerInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "企业用电信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EEnterprisePowerInfo.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String enterpriseName) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getEEnterprisePowerInfoList(enterpriseName), EEnterprisePowerInfo.class, "企业用电信息","企业用电信息"));
+    public void exportData(HttpServletResponse response,String enterpriseName) {
+        ExcelExportUtil.exportExcel(response,service.getEEnterprisePowerInfoList(enterpriseName), EEnterprisePowerInfo.class, "企业用电信息","企业用电信息");
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.info;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EAdminLicenseInfo;
 import com.zksy.info.domain.EGas;
 import com.zksy.info.service.EAdminLicenseInfoService;
@@ -39,7 +40,7 @@ public class EGasController {
     public AjaxResult getEGasList(String company,String userInfo){
         return AjaxResult.success(service.getEGasList(company,userInfo));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询燃气信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,28 @@ public class EGasController {
     @PostMapping("/save")
     @ApiOperation(value = "燃气信息保存")
     public AjaxResult save(@RequestBody EGas egas) {
-        return AjaxResult.success(service.save(egas));
+        return service.save(egas) ? AjaxResult.success(egas) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "燃气信息修改")
     public AjaxResult update(@RequestBody EGas egas) {
-        return AjaxResult.success(service.updateById(egas));
+        egas.setUpdateTime(new DateTime());
+        return service.updateById(egas) ? AjaxResult.success(egas) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "燃气信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EGas.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String company,String userInfo) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getEGasList(company,userInfo), EGas.class, "燃气信息","燃气信息"));
+    public void exportData(HttpServletResponse response,String company,String userInfo) {
+        ExcelExportUtil.exportExcel(response,service.getEGasList(company,userInfo), EGas.class, "燃气信息","燃气信息");
     }
 
 }

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.info;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.info.domain.EAdminLicenseInfo;
+import com.zksy.info.domain.EQualificationCertificate;
+import com.zksy.info.service.EAdminLicenseInfoService;
+import com.zksy.info.service.EQualificationCertificateService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 行政许可控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/equalificationCertificate")
+@Api(tags = "资质证书",description = "资质证书desc")
+public class EQualificationCertificateController {
+    @Autowired
+    private EQualificationCertificateService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "资质证书查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String entName,String certificateType,String certificateNo){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, entName,certificateType,certificateNo));
+    }
+    @GetMapping("/getEQualificationCertificateList")
+    @ApiOperation(value = "资质证书查询")
+    public AjaxResult getEQualificationCertificateList(String entName,String certificateType,String certificateNo){
+        return AjaxResult.success(service.getEQualificationCertificateList(entName,certificateType,certificateNo));
+    }
+    @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 EQualificationCertificate eAdminLicenseInfo) {
+        return service.save(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo): AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "资质证书修改")
+    public AjaxResult update(@RequestBody EQualificationCertificate eAdminLicenseInfo) {
+        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo): AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "资质证书删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EQualificationCertificate.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String entName,String certificateType,String certificateNo) {
+        ExcelExportUtil.exportExcel(response,service.getEQualificationCertificateList(entName,certificateType,certificateNo), EQualificationCertificate.class, "资质证书","资质证书");
+    }
+
+}

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.info;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.info.domain.EQuarterlyElectricityBill;
+import com.zksy.info.domain.EQuarterlyWaterUsage;
+import com.zksy.info.service.EQuarterlyElectricityBillService;
+import com.zksy.info.service.EQuarterlyWaterUsageService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 用电控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/equarterlyElectricityBill")
+@Api(tags = "用电信息",description = "用电信息desc")
+public class EQuarterlyElectricityBillController {
+    @Autowired
+    private EQuarterlyElectricityBillService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "用电信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String enterpriseName,String unifiedSocialCreditCode,String gridAccountNumber,String year,String arrearExists){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, enterpriseName,unifiedSocialCreditCode,gridAccountNumber,year,arrearExists));
+    }
+    @GetMapping("/getEQuarterlyWaterUsageList")
+    @ApiOperation(value = "用电信息查询")
+    public AjaxResult getEQuarterlyWaterUsageList(String enterpriseName,String unifiedSocialCreditCode,String gridAccountNumber,String year,String arrearExists){
+        return AjaxResult.success(service.getEQuarterlyElectricityBillList(enterpriseName,unifiedSocialCreditCode,gridAccountNumber,year,arrearExists));
+    }
+    @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 EQuarterlyElectricityBill equarterlyElectricityBill) {
+        return service.save(equarterlyElectricityBill) ? AjaxResult.success(equarterlyElectricityBill) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "用电信息修改")
+    public AjaxResult update(@RequestBody EQuarterlyElectricityBill equarterlyElectricityBill) {
+        equarterlyElectricityBill.setUpdateTime(new DateTime());
+        return service.updateById(equarterlyElectricityBill) ? AjaxResult.success(equarterlyElectricityBill) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "用电信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EQuarterlyElectricityBill.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String enterpriseName,String unifiedSocialCreditCode,String gridAccountNumber,String year,String arrearExists) {
+        ExcelExportUtil.exportExcel(response,service.getEQuarterlyElectricityBillList(enterpriseName,unifiedSocialCreditCode,gridAccountNumber,year,arrearExists), EQuarterlyElectricityBill.class, "用电信息","用电信息");
+    }
+
+}

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

@@ -0,0 +1,73 @@
+package com.zksy.controller.info;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.info.domain.EQuarterlyWaterUsage;
+import com.zksy.info.service.EQuarterlyWaterUsageService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 用水控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/equarterlyWaterUsage")
+@Api(tags = "用水信息",description = "用水信息desc")
+public class EQuarterlyWaterUsageController {
+    @Autowired
+    private EQuarterlyWaterUsageService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "用水信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String unitName,String unifiedSocialCreditCode,String annual,String isCurrentlyInArrears){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, unitName,unifiedSocialCreditCode,annual,isCurrentlyInArrears));
+    }
+    @GetMapping("/getEQuarterlyWaterUsageList")
+    @ApiOperation(value = "用水信息查询")
+    public AjaxResult getEQuarterlyWaterUsageList(String unitName,String unifiedSocialCreditCode,String annual,String isCurrentlyInArrears){
+        return AjaxResult.success(service.getEQuarterlyWaterUsageList(unitName,unifiedSocialCreditCode,annual,isCurrentlyInArrears));
+    }
+    @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 EQuarterlyWaterUsage ewater) {
+        return service.save(ewater) ? AjaxResult.success(ewater) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "用水信息修改")
+    public AjaxResult update(@RequestBody EQuarterlyWaterUsage ewater) {
+        ewater.setUpdateTime(new DateTime());
+        return service.updateById(ewater) ? AjaxResult.success(ewater) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "用水信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EQuarterlyWaterUsage.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String unitName,String unifiedSocialCreditCode,String annual,String isCurrentlyInArrears) {
+        ExcelExportUtil.exportExcel(response,service.getEQuarterlyWaterUsageList(unitName,unifiedSocialCreditCode,annual,isCurrentlyInArrears), EQuarterlyWaterUsage.class, "用水信息","用水信息");
+    }
+
+}

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

@@ -1,73 +0,0 @@
-package com.zksy.controller.info;
-
-import com.zksy.info.domain.EGas;
-import com.zksy.info.domain.EWater;
-import com.zksy.info.service.EGasService;
-import com.zksy.info.service.EWaterService;
-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.util.Arrays;
-
-/**
- * @author Administrator
- * @version 1.0
- * @project enterprise-assets-service
- * @description 用水控制层
- * @date 2025/6/24 14:33:13
- */
-@RestController
-@RequestMapping("/ewater")
-@Api(tags = "用水信息",description = "用水信息desc")
-public class EWaterController {
-    @Autowired
-    private EWaterService service;
-    @GetMapping("/findByPage")
-    @ApiOperation(value = "用水信息查询分页")
-    public AjaxResult findByPage(long pageNum, long pageSize, String company,String userInfo){
-        return AjaxResult.success(service.findByPage(pageNum, pageSize, company,userInfo));
-    }
-    @GetMapping("/getEWaterList")
-    @ApiOperation(value = "用水信息查询")
-    public AjaxResult getEWaterList(String company,String userInfo){
-        return AjaxResult.success(service.getEWaterList(company,userInfo));
-    }
-    @GetMapping("/getById/{borrowId}")
-    @ApiOperation(value = "根据Id查询用水信息")
-    public AjaxResult getById(@PathVariable String id){
-        return AjaxResult.success(service.getById(id));
-    }
-    @PostMapping("/save")
-    @ApiOperation(value = "用水信息保存")
-    public AjaxResult save(@RequestBody EWater ewater) {
-        return AjaxResult.success(service.save(ewater));
-    }
-    @PostMapping("/update")
-    @ApiOperation(value = "用水信息修改")
-    public AjaxResult update(@RequestBody EWater ewater) {
-        return AjaxResult.success(service.updateById(ewater));
-    }
-    @PostMapping("/deleteBatch")
-    @ApiOperation(value = "用水信息删除")
-    public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
-    }
-    @PostMapping("/importData")
-    @ApiOperation(value = "导入数据")
-    public AjaxResult importData(MultipartFile file) {
-        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, EWater.class)));
-    }
-    @PostMapping("/exportData")
-    @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String company,String userInfo) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getEWaterList(company,userInfo), EWater.class, "用水信息","用水信息"));
-    }
-
-}

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

@@ -0,0 +1,84 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AAssetManagement;
+import com.zksy.property.domain.AInnovation;
+import com.zksy.property.service.AAssetManagementService;
+import com.zksy.property.service.AInnovationService;
+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.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("/aassetManagement")
+@Api(tags = "资产信息管理信息",description = "资产信息管理信息desc")
+public class AAssetManagementController {
+    @Autowired
+    private AAssetManagementService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "资产信息管理信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String assetCode,String assetName,String assetType){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, assetCode,assetName,assetType));
+    }
+    @GetMapping("/getAAssetManagementList")
+    @ApiOperation(value = "资产信息管理信息查询")
+    public AjaxResult getAAssetManagementList(String assetCode,String assetName,String assetType){
+        return AjaxResult.success(service.getAAssetManagementList(assetCode,assetName,assetType));
+    }
+    @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 AAssetManagement aassetManagement) {
+        if("公租房".equals(aassetManagement.getAssetType())){
+            aassetManagement.setAssetCode("GZF"+ generateAssetNumber());
+        }else if("厂房".equals(aassetManagement.getAssetType())){
+            aassetManagement.setAssetCode("CF"+ generateAssetNumber());
+        }else {
+            aassetManagement.setAssetCode("QT"+ generateAssetNumber());
+        }
+        return service.save(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "资产信息管理信息修改")
+    public AjaxResult update(@RequestBody AAssetManagement aassetManagement) {
+        aassetManagement.setUpdateTime(new DateTime());
+        return service.updateById(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "资产信息管理信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, AAssetManagement.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String assetCode,String assetName,String assetType) {
+        ExcelExportUtil.exportExcel(response,service.getAAssetManagementList(assetCode,assetName,assetType), AAssetManagement.class, "资产信息管理信息","资产信息管理信息");
+    }
+
+}

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

@@ -0,0 +1,73 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AEquipmentLedger;
+import com.zksy.property.service.AEquipmentLedgerService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 资产信息管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/AEquipmentLedger")
+@Api(tags = "设备台账",description = "设备台账desc")
+public class AEquipmentLedgerController {
+    @Autowired
+    private AEquipmentLedgerService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "设备台账查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String equipmentId,String equipmentName,String equipmentType,String activeState){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, equipmentId,equipmentName,equipmentType,activeState));
+    }
+    @GetMapping("/getAEquipmentLedgerList")
+    @ApiOperation(value = "设备台账查询")
+    public AjaxResult getAEquipmentLedgerList( String equipmentId,String equipmentName,String equipmentType,String activeState){
+        return AjaxResult.success(service.getAEquipmentLedgerList(equipmentId,equipmentName,equipmentType,activeState));
+    }
+    @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 AEquipmentLedger aassetManagement) {
+        return service.save(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "设备台账修改")
+    public AjaxResult update(@RequestBody AEquipmentLedger aassetManagement) {
+        aassetManagement.setUpdateTime(new DateTime());
+        return service.updateById(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "设备台账删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, AEquipmentLedger.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response, String equipmentId,String equipmentName,String equipmentType,String activeState) {
+        ExcelExportUtil.exportExcel(response,service.getAEquipmentLedgerList(equipmentId,equipmentName,equipmentType,activeState), AEquipmentLedger.class, "设备台账","设备台账");
+    }
+
+}

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AAssetManagement;
+import com.zksy.property.domain.AEquipmentManagement;
+import com.zksy.property.service.AAssetManagementService;
+import com.zksy.property.service.AEquipmentManagementService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 资产信息管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/aequipmentManagement")
+@Api(tags = "资产附属设施管理",description = "资产附属设施管理desc")
+public class AEquipmentManagementController {
+    @Autowired
+    private AEquipmentManagementService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "资产附属设施管理查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String assetCode,String equipmentName,String equipmentType,String modelNumber){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, assetCode,equipmentName,equipmentType,modelNumber));
+    }
+    @GetMapping("/getAAssetManagementList")
+    @ApiOperation(value = "资产附属设施管理查询")
+    public AjaxResult getAAssetManagementList(String assetCode,String equipmentName,String equipmentType,String modelNumber){
+        return AjaxResult.success(service.getAEquipmentManagementList(assetCode,equipmentName,equipmentType,modelNumber));
+    }
+    @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 AEquipmentManagement aequipmentManagement) {
+        return service.save(aequipmentManagement) ? AjaxResult.success(aequipmentManagement) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "资产附属设施管理修改")
+    public AjaxResult update(@RequestBody AEquipmentManagement aequipmentManagement) {
+        aequipmentManagement.setUpdateTime(new DateTime());
+        return service.updateById(aequipmentManagement) ? AjaxResult.success(aequipmentManagement) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "资产附属设施管理删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, AEquipmentManagement.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String assetCode,String equipmentName,String equipmentType,String modelNumber) {
+        ExcelExportUtil.exportExcel(response,service.getAEquipmentManagementList(assetCode,equipmentName,equipmentType,modelNumber), AEquipmentManagement.class, "资产附属设施管理","资产附属设施管理");
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.property;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.property.domain.AHouseType;
 import com.zksy.property.service.AHouseTypeService;
 import com.zksy.utils.AjaxResult;
@@ -24,10 +25,10 @@ import java.util.List;
 public class AHouseTypeController {
     @Autowired
     private AHouseTypeService service;
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "户型查询")
-    public AjaxResult getById(@PathVariable String borrowId) {
-        return AjaxResult.success(service.getById(borrowId));
+    public AjaxResult getById(@PathVariable String id) {
+        return AjaxResult.success(service.getById(id));
     }
     @GetMapping("/getList")
     @ApiOperation(value = "户型查询所有")
@@ -47,6 +48,7 @@ public class AHouseTypeController {
     @PostMapping("/update")
     @ApiOperation(value = "户型修改")
     public AjaxResult update(AHouseType houseType, MultipartFile multipartFile) {
+        houseType.setUpdateTime(new DateTime());
         return service.updateHouseType(houseType, multipartFile)? AjaxResult.success(houseType): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AInnovation;
+import com.zksy.property.domain.APropertyReceipt;
+import com.zksy.property.service.AInnovationService;
+import com.zksy.property.service.APropertyReceiptService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 创新创业收入情况控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/ainnovation")
+@Api(tags = "创新创业收入情况信息",description = "创新创业收入情况信息desc")
+public class AInnovationController {
+    @Autowired
+    private AInnovationService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "创新创业收入情况信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String receiptNumber,String building,String roomNumber){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, receiptNumber,building,roomNumber));
+    }
+    @GetMapping("/getAInnovationList")
+    @ApiOperation(value = "创新创业收入情况信息查询")
+    public AjaxResult getAInnovationList(String receiptNumber,String building,String roomNumber){
+        return AjaxResult.success(service.getAInnovationList(receiptNumber,building,roomNumber));
+    }
+    @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 AInnovation ainnovation) {
+        return service.save(ainnovation) ? AjaxResult.success(ainnovation) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "创新创业收入情况信息修改")
+    public AjaxResult update(@RequestBody AInnovation ainnovation) {
+        ainnovation.setUpdateTime(new DateTime());
+        return service.updateById(ainnovation) ? AjaxResult.success(ainnovation) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "创新创业收入情况信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, AInnovation.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String receiptNumber,String building,String roomNumber) {
+        ExcelExportUtil.exportExcel(response,service.getAInnovationList(receiptNumber,building,roomNumber), AInnovation.class, "创新创业收入情况信息","创新创业收入情况信息");
+    }
+
+}

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AAssetManagement;
+import com.zksy.property.domain.AMaintenance;
+import com.zksy.property.service.AAssetManagementService;
+import com.zksy.property.service.AMaintenanceService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 维修管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/amaintenance")
+@Api(tags = "维修管理信息",description = "维修管理信息desc")
+public class AMaintenanceController {
+    @Autowired
+    private AMaintenanceService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "维修管理信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String assetCode,String equipmentName,String taskTitle,String taskStatus){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, assetCode,equipmentName,taskTitle,taskStatus));
+    }
+    @GetMapping("/getAMaintenanceList")
+    @ApiOperation(value = "维修管理信息查询")
+    public AjaxResult getAAssetManagementList(String assetCode,String equipmentName,String taskTitle,String taskStatus){
+        return AjaxResult.success(service.getAMaintenanceList(assetCode,equipmentName,taskTitle,taskStatus));
+    }
+    @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 AMaintenance amaintenance) {
+        return service.save(amaintenance) ? AjaxResult.success(amaintenance) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "维修管理信息修改")
+    public AjaxResult update(@RequestBody AMaintenance amaintenance) {
+        amaintenance.setUpdateTime(new DateTime());
+        return service.updateById(amaintenance) ? AjaxResult.success(amaintenance) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "维修管理信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, AMaintenance.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String assetCode,String equipmentName,String taskTitle,String taskStatus) {
+        ExcelExportUtil.exportExcel(response,service.getAMaintenanceList(assetCode,equipmentName,taskTitle,taskStatus), AMaintenance.class, "维修管理信息","维修管理信息");
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.property;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.property.domain.APropertyReceipt;
 import com.zksy.property.domain.ARentalProperty;
 import com.zksy.property.service.APropertyReceiptService;
@@ -39,7 +40,7 @@ public class APropertyReceiptController {
     public AjaxResult getAPropertyReceiptList(String unit,String building){
         return AjaxResult.success(service.getAPropertyReceiptList(unit,building));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询标准化厂房收入情况信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,28 @@ public class APropertyReceiptController {
     @PostMapping("/save")
     @ApiOperation(value = "标准化厂房收入情况信息保存")
     public AjaxResult save(@RequestBody APropertyReceipt eAdminLicenseInfo) {
-        return AjaxResult.success(service.save(eAdminLicenseInfo));
+        return service.save(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "标准化厂房收入情况信息修改")
     public AjaxResult update(@RequestBody APropertyReceipt eAdminLicenseInfo) {
-        return AjaxResult.success(service.updateById(eAdminLicenseInfo));
+        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "标准化厂房收入情况信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, APropertyReceipt.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String unit,String building) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getAPropertyReceiptList(unit,building), APropertyReceipt.class, "标准化厂房收入情况信息","标准化厂房收入情况信息"));
+    public void exportData(HttpServletResponse response,String unit,String building) {
+        ExcelExportUtil.exportExcel(response,service.getAPropertyReceiptList(unit,building), APropertyReceipt.class, "标准化厂房收入情况信息","标准化厂房收入情况信息");
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.property;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.property.domain.APropertyReceipt;
 import com.zksy.property.domain.APublicRentalHousing;
 import com.zksy.property.service.APropertyReceiptService;
@@ -20,54 +21,55 @@ import java.util.Arrays;
  * @author Administrator
  * @version 1.0
  * @project enterprise-assets-service
- * @description 公租房租赁情况控制层
+ * @description 公租房租金收入情况控制层
  * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/apublicRentalHousing")
-@Api(tags = "公租房租赁情况信息",description = "公租房租赁情况信息desc")
+@Api(tags = "公租房租金收入情况",description = "公租房租金收入情况desc")
 public class APublicRentalHousingController {
     @Autowired
     private APublicRentalHousingService service;
     @GetMapping("/findByPage")
-    @ApiOperation(value = "公租房租赁情况信息查询分页")
+    @ApiOperation(value = "公租房租金收入情况查询分页")
     public AjaxResult findByPage(long pageNum, long pageSize, String receiptNumber,String building,String roomNumber){
         return AjaxResult.success(service.findByPage(pageNum, pageSize, receiptNumber,building,roomNumber));
     }
     @GetMapping("/getARentalPropertyList")
-    @ApiOperation(value = "公租房租赁情况信息查询")
-    public AjaxResult getAPropertyReceiptList(String unit,String building,String roomNumber){
-        return AjaxResult.success(service.getAPublicRentalHousingList(unit,building,roomNumber));
+    @ApiOperation(value = "公租房租金收入情况查询")
+    public AjaxResult getAPropertyReceiptList(String receiptNumber,String building,String roomNumber){
+        return AjaxResult.success(service.getAPublicRentalHousingList(receiptNumber,building,roomNumber));
     }
-    @GetMapping("/getById/{borrowId}")
-    @ApiOperation(value = "根据Id查询公租房租赁情况信息")
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "根据Id查询公租房租金收入情况")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
     }
     @PostMapping("/save")
-    @ApiOperation(value = "公租房租赁情况信息保存")
+    @ApiOperation(value = "公租房租金收入情况保存")
     public AjaxResult save(@RequestBody APublicRentalHousing eAdminLicenseInfo) {
-        return AjaxResult.success(service.save(eAdminLicenseInfo));
+        return service.save(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
-    @ApiOperation(value = "公租房租赁情况信息修改")
+    @ApiOperation(value = "公租房租金收入情况修改")
     public AjaxResult update(@RequestBody APublicRentalHousing eAdminLicenseInfo) {
-        return AjaxResult.success(service.updateById(eAdminLicenseInfo));
+        eAdminLicenseInfo.setUpdateTime(new DateTime());
+        return service.updateById(eAdminLicenseInfo) ? AjaxResult.success(eAdminLicenseInfo) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
-    @ApiOperation(value = "公租房租赁情况信息删除")
+    @ApiOperation(value = "公租房租金收入情况删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, APublicRentalHousing.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String unit,String building,String roomNumber) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getAPublicRentalHousingList(unit,building,roomNumber), APublicRentalHousing.class, "公租房租赁情况信息","公租房租赁情况信息"));
+    public void exportData(HttpServletResponse response,String receiptNumber,String building,String roomNumber) {
+        ExcelExportUtil.exportExcel(response,service.getAPublicRentalHousingList(receiptNumber,building,roomNumber), APublicRentalHousing.class, "公租房租金收入情况","公租房租金收入情况");
     }
 
 }

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AAssetManagement;
+import com.zksy.property.domain.ARentalContract;
+import com.zksy.property.service.AAssetManagementService;
+import com.zksy.property.service.ARentalContractService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 租赁合同管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/arentalContract")
+@Api(tags = "租赁合同管理",description = "租赁合同管理desc")
+public class ARentalContractController {
+    @Autowired
+    private ARentalContractService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "租赁合同管理查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String tenantName,String contractNumber,String contractStatus){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, tenantName,contractNumber,contractStatus));
+    }
+    @GetMapping("/getARentalContractList")
+    @ApiOperation(value = "租赁合同管理查询")
+    public AjaxResult getARentalContractList(String tenantName,String contractNumber,String contractStatus){
+        return AjaxResult.success(service.getARentalContractList(tenantName,contractNumber,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 ARentalContract aassetManagement) {
+        return service.save(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "租赁合同管理修改")
+    public AjaxResult update(@RequestBody ARentalContract aassetManagement) {
+        aassetManagement.setUpdateTime(new DateTime());
+        return service.updateById(aassetManagement) ? AjaxResult.success(aassetManagement) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "租赁合同管理删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, ARentalContract.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String tenantName,String contractNumber,String contractStatus) {
+        ExcelExportUtil.exportExcel(response,service.getARentalContractList(tenantName,contractNumber,contractStatus), ARentalContract.class, "租赁合同管理","租赁合同管理");
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.property;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.info.domain.EAdminLicenseInfo;
 import com.zksy.info.service.EAdminLicenseInfoService;
 import com.zksy.property.domain.ARentalProperty;
@@ -39,7 +40,7 @@ public class ARentalPropertyController {
     public AjaxResult getARentalPropertyList(String licenseCertificateName,String electricMeterNumber,String roomNumber){
         return AjaxResult.success(service.getARentalPropertyList(licenseCertificateName,electricMeterNumber,roomNumber));
     }
-    @GetMapping("/getById/{borrowId}")
+    @GetMapping("/getById/{id}")
     @ApiOperation(value = "根据Id查询公租房租赁情况信息")
     public AjaxResult getById(@PathVariable String id){
         return AjaxResult.success(service.getById(id));
@@ -47,27 +48,31 @@ public class ARentalPropertyController {
     @PostMapping("/save")
     @ApiOperation(value = "公租房租赁情况信息保存")
     public AjaxResult save(@RequestBody ARentalProperty arentalProperty) {
-        return AjaxResult.success(service.save(arentalProperty));
+        return service.save(arentalProperty) ? AjaxResult.success(arentalProperty) : AjaxResult.error("保存失败");
     }
     @PostMapping("/update")
     @ApiOperation(value = "公租房租赁情况信息修改")
     public AjaxResult update(@RequestBody ARentalProperty arentalProperty) {
-        return AjaxResult.success(service.updateById(arentalProperty));
+        arentalProperty.setUpdateTime(new DateTime());
+        return service.updateById(arentalProperty) ? AjaxResult.success(arentalProperty) : AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "公租房租赁情况信息删除")
     public AjaxResult delete(@RequestBody String[] ids) {
-        return AjaxResult.success(service.removeBatchByIds(Arrays.asList(ids)));
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
     @PostMapping("/importData")
     @ApiOperation(value = "导入数据")
     public AjaxResult importData(MultipartFile file) {
         return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, ARentalProperty.class)));
     }
-    @PostMapping("/exportData")
+    @GetMapping("/exportData")
     @ApiOperation(value = "导出数据")
-    public AjaxResult exportData(HttpServletResponse response,String licenseCertificateName,String licenseNumber,String currentStatus) {
-        return AjaxResult.success(ExcelExportUtil.exportExcel(response,service.getARentalPropertyList(licenseCertificateName,licenseNumber,currentStatus), ARentalProperty.class, "公租房租赁情况信息","公租房租赁情况信息"));
+    public void exportData(HttpServletResponse response, String licenseCertificateName, String licenseNumber, String currentStatus) {
+        ExcelExportUtil.exportExcel(response,service.getARentalPropertyList(licenseCertificateName, licenseNumber, currentStatus),
+                ARentalProperty.class,
+                "公租房租赁情况信息",
+                "公租房租赁情况信息");
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.zksy.controller.property;
 
+import cn.hutool.core.date.DateTime;
 import com.zksy.property.domain.ARoom;
 import com.zksy.property.service.ARoomService;
 import com.zksy.utils.AjaxResult;
@@ -37,6 +38,7 @@ public class ARoomController {
     @PostMapping("/update")
     @ApiOperation(value = "房间修改")
     public AjaxResult update(ARoom aRoom, MultipartFile multipartFile) {
+        aRoom.setUpdateTime(new DateTime());
         return service.updateARoom(aRoom,multipartFile)? AjaxResult.success(aRoom): AjaxResult.error("修改失败");
     }
     @PostMapping("/updateBatch")

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

@@ -0,0 +1,75 @@
+package com.zksy.controller.property;
+
+import cn.hutool.core.date.DateTime;
+import com.zksy.property.domain.AAssetManagement;
+import com.zksy.property.domain.ATenantManagement;
+import com.zksy.property.service.AAssetManagementService;
+import com.zksy.property.service.ATenantManagementService;
+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.util.Arrays;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 租户信息管理控制层
+ * @date 2025/6/24 14:33:13
+ */
+@RestController
+@RequestMapping("/atenantManagement")
+@Api(tags = "租户信息管理信息",description = "租户信息管理信息desc")
+public class ATenantManagementController {
+    @Autowired
+    private ATenantManagementService service;
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "租户信息管理信息查询分页")
+    public AjaxResult findByPage(long pageNum, long pageSize, String personalName,String companyName,String tenantStatus){
+        return AjaxResult.success(service.findByPage(pageNum, pageSize, personalName,companyName,tenantStatus));
+    }
+    @GetMapping("/getATenantManagementList")
+    @ApiOperation(value = "租户信息管理信息查询")
+    public AjaxResult getATenantManagementList(String personalName,String companyName,String tenantStatus){
+        return AjaxResult.success(service.getATenantManagementList(personalName,companyName,tenantStatus));
+    }
+    @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 ATenantManagement atenantManagement) {
+        return service.save(atenantManagement) ? AjaxResult.success(atenantManagement) : AjaxResult.error("保存失败");
+    }
+    @PostMapping("/update")
+    @ApiOperation(value = "租户信息管理信息修改")
+    public AjaxResult update(@RequestBody ATenantManagement atenantManagement) {
+        atenantManagement.setUpdateTime(new DateTime());
+        return service.updateById(atenantManagement) ? AjaxResult.success(atenantManagement) : AjaxResult.error("修改失败");
+    }
+    @PostMapping("/deleteBatch")
+    @ApiOperation(value = "租户信息管理信息删除")
+    public AjaxResult delete(@RequestBody String[] ids) {
+        return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
+    }
+    @PostMapping("/importData")
+    @ApiOperation(value = "导入数据")
+    public AjaxResult importData(MultipartFile file) {
+        return AjaxResult.success(service.saveOrUpdateBatch(ExcelImportUtil.importExcel(file, ATenantManagement.class)));
+    }
+    @GetMapping("/exportData")
+    @ApiOperation(value = "导出数据")
+    public void exportData(HttpServletResponse response,String personalName,String companyName,String tenantStatus) {
+        ExcelExportUtil.exportExcel(response,service.getATenantManagementList(personalName,companyName,tenantStatus), ATenantManagement.class, "租户信息管理信息","租户信息管理信息");
+    }
+
+}

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

@@ -1,5 +1,7 @@
 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;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -24,90 +26,104 @@ public class EEmployeeMaster implements Serializable {
      */
     @ApiModelProperty(value = "主键")
     @TableId(type = IdType.ASSIGN_UUID)
+    @ExcelIgnore
     private String id;
 
     /**
      * 员工工号
      */
+    @ExcelProperty(value = "员工工号")
     @ApiModelProperty(value = "员工工号")
     private String employeeNo;
 
     /**
      * 姓名
      */
+    @ExcelProperty(value = "姓名")
     @ApiModelProperty(value = "姓名")
     private String fullName;
 
     /**
      * 入职日期
      */
+    @ExcelProperty(value = "入职日期")
     @ApiModelProperty(value = "入职日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hireDate;
 
     /**
      * 离职日期
      */
+    @ExcelProperty(value = "离职日期")
     @ApiModelProperty(value = "离职日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date terminationDate;
 
     /**
      * 联系电话
      */
+    @ExcelProperty(value = "联系电话")
     @ApiModelProperty(value = "联系电话")
     private String contactPhone;
 
     /**
      * 当前合同编号
      */
+    @ExcelProperty(value = "当前合同编号")
     @ApiModelProperty(value = "当前合同编号")
     private String contractNo;
 
     /**
      * 合同类型
      */
+    @ExcelProperty(value = "合同类型")
     @ApiModelProperty(value = "合同类型")
     private String contractType;
 
     /**
      * 合同开始日期
      */
+    @ExcelProperty(value = "合同开始日期")
     @ApiModelProperty(value = "合同开始日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date contractStartDate;
 
     /**
      * 合同结束日期
      */
+    @ExcelProperty(value = "合同结束日期")
     @ApiModelProperty(value = "合同结束日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date contractEndDate;
 
     /**
      * 合同状态
      */
+    @ExcelProperty(value = "合同状态")
     @ApiModelProperty(value = "合同状态('有效', '已到期', '已解除', '已终止')")
     private String contractStatus;
 
     /**
      * 工资
      */
+    @ExcelProperty(value = "工资")
     @ApiModelProperty(value = "工资")
     private BigDecimal salary;
 
     /**
      * 创建时间
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @ExcelIgnore
     @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     @TableField(exist = false)

src/main/java/com/zksy/info/service/EEmployeeMasterService.java

@@ -12,7 +12,7 @@ import java.util.List;
 * @createDate 2025-06-27 15:57:22
 */
 public interface EEmployeeMasterService extends IService<EEmployeeMaster> {
-    Page<EEmployeeMaster> findByPage(long pageNum, long pageSize, String workNumber, String fullName, String contractNo);
-    List<EEmployeeMaster> getEEmployeeMasterList(String workNumber, String fullName, String contractNo);
+    Page<EEmployeeMaster> findByPage(long pageNum, long pageSize, String contractStatus, String fullName, String contractNo);
+    List<EEmployeeMaster> getEEmployeeMasterList(String contractStatus, String fullName, String contractNo);
 
 }

src/main/java/com/zksy/info/service/impl/EEmployeeMasterServiceImpl.java

@@ -20,10 +20,10 @@ public class EEmployeeMasterServiceImpl extends ServiceImpl<EEmployeeMasterMappe
     implements EEmployeeMasterService{
 
     @Override
-    public Page<EEmployeeMaster> findByPage(long pageNum, long pageSize, String workNumber, String fullName, String contractNo) {
+    public Page<EEmployeeMaster> findByPage(long pageNum, long pageSize, String contractStatus, String fullName, String contractNo) {
         Page<EEmployeeMaster> page = new Page<>(pageNum,pageSize);
         LambdaQueryWrapper<EEmployeeMaster> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.like(workNumber != null ,EEmployeeMaster::getEmployeeNo,workNumber);
+        queryWrapper.like(contractStatus != null ,EEmployeeMaster::getContractStatus,contractStatus);
         queryWrapper.like(fullName != null ,EEmployeeMaster::getFullName,fullName);
         queryWrapper.like(contractNo != null ,EEmployeeMaster::getContractNo,contractNo);
         queryWrapper.orderByDesc(EEmployeeMaster::getUpdateTime);
@@ -32,9 +32,9 @@ public class EEmployeeMasterServiceImpl extends ServiceImpl<EEmployeeMasterMappe
     }
 
     @Override
-    public List<EEmployeeMaster> getEEmployeeMasterList(String workNumber, String fullName, String contractNo) {
+    public List<EEmployeeMaster> getEEmployeeMasterList(String contractStatus, String fullName, String contractNo) {
         LambdaQueryWrapper<EEmployeeMaster> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.like(workNumber != null ,EEmployeeMaster::getEmployeeNo,workNumber);
+        queryWrapper.like(contractStatus != null ,EEmployeeMaster::getContractStatus,contractStatus);
         queryWrapper.like(fullName != null ,EEmployeeMaster::getFullName,fullName);
         queryWrapper.like(contractNo != null ,EEmployeeMaster::getContractNo,contractNo);
         queryWrapper.orderByDesc(EEmployeeMaster::getUpdateTime);

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

@@ -29,6 +29,12 @@ public class AHouseType implements Serializable {
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
+    /**
+     * 资产主键
+     */
+    @ApiModelProperty("资产主键")
+    private String assetId;
+
     /**
      * 户号
      */
@@ -56,7 +62,7 @@ public class AHouseType implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -69,7 +75,7 @@ public class AHouseType implements Serializable {
      * 修改时间
      */
     @ApiModelProperty("修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

src/main/java/com/zksy/property/service/impl/ARoomServiceImpl.java

@@ -31,7 +31,7 @@ public class ARoomServiceImpl extends ServiceImpl<ARoomMapper, ARoom>
     @Override
     public List<ARoom> getByHouseTypeId(String houseTypeId) {
         QueryWrapper<ARoom> queryWrapper = new QueryWrapper();
-        queryWrapper.eq(houseTypeId != null,"house_type_id",houseTypeId);
+        queryWrapper.like(houseTypeId != null,"house_type_id",houseTypeId);
         List<ARoom> list = mapper.selectList(queryWrapper);
         return list;
     }

src/main/java/com/zksy/utils/ExcelExportUtil.java

@@ -9,7 +9,6 @@ import org.apache.poi.ss.usermodel.HorizontalAlignment;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.List;
 
@@ -23,15 +22,19 @@ public class ExcelExportUtil {
      * @param fileName 文件名
      * @param sheetName 工作表名
      * @param <T> 数据类型
-     * @return 导出成功返回 true，失败返回 false
      */
-    public static <T> boolean exportExcel(HttpServletResponse response, List<T> dataList, Class<T> head,
-                                          String fileName, String sheetName) {
+    public static <T> void exportExcel(HttpServletResponse response, List<T> dataList, Class<T> head,
+                                       String fileName, String sheetName) {
         try {
-            // 设置响应头
+            // 设置响应头，明确指定xlsx格式
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("UTF-8");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+            // 确保文件名有.xlsx后缀
+            if (!fileName.toLowerCase().endsWith(".xlsx")) {
+                fileName += ".xlsx";
+            }
+            // 使用ISO-8859-1编码处理文件名，防止中文乱码
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"));
 
             // 配置表头样式
             WriteCellStyle headWriteCellStyle = new WriteCellStyle();
@@ -48,18 +51,16 @@ public class ExcelExportUtil {
             HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                     new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
 
-            // 获取输出流并写入 Excel 数据，使用指定的类作为表头，会自动过滤没有 @ExcelProperty 注解的字段
-            try (OutputStream outputStream = response.getOutputStream()) {
-                EasyExcel.write(outputStream, head)
-                        .registerWriteHandler(horizontalCellStyleStrategy)
-                        .sheet(sheetName)
-                        .doWrite(dataList);
-            }
-            return true;
+            // 写入 Excel 数据，使用指定的类作为表头，会自动过滤没有 @ExcelProperty 注解的字段
+            EasyExcel.write(response.getOutputStream(), head)
+                    .registerWriteHandler(horizontalCellStyleStrategy)
+                    .sheet(sheetName)
+                    .doWrite(dataList);
         } catch (IOException e) {
             // 记录异常日志
             e.printStackTrace();
-            return false;
+            // 抛出运行时异常，由Spring MVC统一异常处理
+            throw new RuntimeException("导出Excel失败", e);
         }
     }
 
@@ -73,10 +74,15 @@ public class ExcelExportUtil {
                                              List<SheetData<?>> sheetDataList,
                                              String fileName) {
         try {
-            // 设置响应头
+            // 设置响应头，明确指定xlsx格式
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("UTF-8");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+            // 确保文件名有.xlsx后缀
+            if (!fileName.toLowerCase().endsWith(".xlsx")) {
+                fileName += ".xlsx";
+            }
+            // 使用ISO-8859-1编码处理文件名，防止中文乱码
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"));
 
             // 配置表头样式
             WriteCellStyle headWriteCellStyle = new WriteCellStyle();
@@ -93,22 +99,22 @@ public class ExcelExportUtil {
             HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                     new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
 
-            // 获取输出流并写入 Excel 数据
-            try (OutputStream outputStream = response.getOutputStream()) {
-                var excelWriter = EasyExcel.write(outputStream).registerWriteHandler(horizontalCellStyleStrategy).build();
-                try {
-                    for (SheetData<?> sheetData : sheetDataList) {
-                        WriteSheet writeSheet = EasyExcel.writerSheet(sheetData.getSheetName())
-                                .head(sheetData.getHead()).build();
-                        excelWriter.write(sheetData.getDataList(), writeSheet);
-                    }
-                } finally {
-                    // 关闭 writer，释放内存
-                    excelWriter.finish();
+            // 写入多sheet Excel数据
+            var excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(horizontalCellStyleStrategy).build();
+            try {
+                for (SheetData<?> sheetData : sheetDataList) {
+                    WriteSheet writeSheet = EasyExcel.writerSheet(sheetData.getSheetName())
+                            .head(sheetData.getHead()).build();
+                    excelWriter.write(sheetData.getDataList(), writeSheet);
                 }
+            } finally {
+                // 关闭 writer，释放内存
+                excelWriter.finish();
             }
         } catch (IOException e) {
             e.printStackTrace();
+            // 抛出运行时异常，由Spring MVC统一异常处理
+            throw new RuntimeException("导出Excel失败", e);
         }
     }
 

src/main/java/com/zksy/utils/util.java

@@ -0,0 +1,27 @@
+package com.zksy.utils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Random;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project enterprise-assets-service
+ * @description 工具类
+ * @date 2025/7/8 14:39:32
+ */
+public class util {
+    public static String generateAssetNumber() {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String timePart = now.format(formatter);
+
+        // 生成3位随机数
+        Random random = new Random();
+        int randomNum = random.nextInt(900) + 100; // 范围是100-999
+
+        // 组合成资产编号
+        return timePart + randomNum;
+    }
+}

src/main/resources/mapper/property/AHouseTypeMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap id="BaseResultMap" type="com.zksy.property.domain.AHouseType">
             <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="assetId" column="asset_id" jdbcType="VARCHAR"/>
             <result property="accountNumber" column="account_number" jdbcType="VARCHAR"/>
             <result property="address" column="address" jdbcType="VARCHAR"/>
             <result property="area" column="area" jdbcType="VARCHAR"/>
@@ -17,7 +18,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,account_number,address,
+        id,asset_id,account_number,address,
         area,create_time,create_by,
         update_time,update_by
     </sql>