refactor(info): 重构员工基本信息相关代码

- 修改日期格式为 yyyy-MM-dd HH:mm:ss
- 更新时区为 GMT+8- 重命名相关方法，如 upLocalDate 改为 update- 调整数据库字段命名，如 upLocalDateTime 改为 updateTime
- 新增员工合同管理相关代码

src/main/java/com/zksy/EnterpriseApplication.java

@@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 启动服务
- * @LocalDate 2025/6/24 14:34:33
+ * @date 2025/6/24 14:34:33
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableScheduling

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

@@ -69,12 +69,12 @@ public class FileManager implements Serializable {
     /**
      * 修改人
      */
-    private String upLocalDateBy;
+    private String updateBy;
 
     /**
      * 修改时间
      */
-    private Date upLocalDateTime;
+    private Date updateTime;
 
     /**
      * 是否删除（0否1是）

src/main/java/com/zksy/common/mapper/FileManagerMapper.java

@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
 /**
  * @author Administrator
  * @description 数据库操作Mapper
- * @createLocalDate 2025-06-25 11:57:55
+ * @createDate 2025-06-25 11:57:55
  */
 @Mapper
 public interface FileManagerMapper extends BaseMapper<FileManager> {

src/main/java/com/zksy/common/service/FileManagerService.java

@@ -10,11 +10,11 @@ import java.util.List;
  * 文件管理Service接口
  *
  * @author sy
- * @LocalDate 2025-06-25
+ * @date 2025-06-25
  */
 public interface FileManagerService extends IService<FileManager> {
     boolean saveMinio(FileManager crmFile, MultipartFile multipartFile);
-    boolean upLocalDateMinio(FileManager crmFile, MultipartFile multipartFile);
+    boolean updateMinio(FileManager crmFile, MultipartFile multipartFile);
     boolean deleteFile(String id);
     List<FileManager> getFileByFid(String fid);
 }

src/main/java/com/zksy/common/service/impl/FileManagerServiceImpl.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * @author sy
- * @LocalDate 2025-06-25
+ * @date 2025-06-25
  */
 @Service
 public class FileManagerServiceImpl extends ServiceImpl<FileManagerMapper, FileManager> implements FileManagerService {
@@ -35,7 +35,7 @@ public class FileManagerServiceImpl extends ServiceImpl<FileManagerMapper, FileM
     }
 
     @Override
-    public boolean upLocalDateMinio(FileManager crmFile, MultipartFile multipartFile) {
+    public boolean updateMinio(FileManager crmFile, MultipartFile multipartFile) {
         try {
             // 删除minio文件
             minioFileStorageService.deleteFile(crmFile.getFileUrl());

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

@@ -7,17 +7,13 @@ import com.zksy.utils.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDate;
 import java.util.Date;
 
 /**
  * @author sy
- * @LocalDate 2025-06-25
+ * @date 2025-06-25
  */
 @RestController
 @RequestMapping("/fileManager")
@@ -29,7 +25,7 @@ public class FileManagerController {
 
     @PostMapping("/upload")
     @ApiOperation(value = "文件管理新增")
-    public AjaxResult save(FileManagerDTO fileManagerDTO) {
+    public AjaxResult save(@RequestBody FileManagerDTO fileManagerDTO) {
         FileManager xcrFile = buildXrcFile(fileManagerDTO);
         xcrFile.setCreateBy("管理员");
         xcrFile.setCreateTime(new Date());
@@ -42,9 +38,9 @@ public class FileManagerController {
     @ApiOperation(value = "文件管理修改")
     public AjaxResult updateById(FileManagerDTO fileManagerDTO) {
         FileManager xcrFile = buildXrcFile(fileManagerDTO);
-        xcrFile.setUpLocalDateBy("管理员");
-        xcrFile.setUpLocalDateTime(new Date());
-        return service.upLocalDateMinio(xcrFile, fileManagerDTO.getFile())
+        xcrFile.setUpdateBy("管理员");
+        xcrFile.setUpdateTime(new Date());
+        return service.updateMinio(xcrFile, fileManagerDTO.getFile())
                 ? AjaxResult.success(xcrFile)
                 : AjaxResult.error("更新失败");
     }

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 行政许可控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/eadminLicenseInfo")
@@ -49,9 +49,9 @@ public class EAdminLicenseInfoController {
     public AjaxResult save(@RequestBody EAdminLicenseInfo eAdminLicenseInfo) {
         return AjaxResult.success(service.save(eAdminLicenseInfo));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "行政许可信息修改")
-    public AjaxResult upLocalDate(@RequestBody EAdminLicenseInfo eAdminLicenseInfo) {
+    public AjaxResult update(@RequestBody EAdminLicenseInfo eAdminLicenseInfo) {
         return AjaxResult.success(service.updateById(eAdminLicenseInfo));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 行政许可控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/earchivesAdministration")
@@ -49,9 +49,9 @@ public class EArchivesAdministrationController {
     public AjaxResult save(@RequestBody EArchivesAdministration eAdminLicenseInfo) {
         return AjaxResult.success(service.save(eAdminLicenseInfo));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "员工档案管理修改")
-    public AjaxResult upLocalDate(@RequestBody EArchivesAdministration eAdminLicenseInfo) {
+    public AjaxResult update(@RequestBody EArchivesAdministration eAdminLicenseInfo) {
         return AjaxResult.success(service.updateById(eAdminLicenseInfo));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 联系人管理控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/econtactManagement")
@@ -49,9 +49,9 @@ public class EContactManagementController {
     public AjaxResult save(@RequestBody EContactManagement econtactManagement) {
         return AjaxResult.success(service.save(econtactManagement));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "联系人管理信息修改")
-    public AjaxResult upLocalDate(@RequestBody EContactManagement econtactManagement) {
+    public AjaxResult update(@RequestBody EContactManagement econtactManagement) {
         return AjaxResult.success(service.updateById(econtactManagement));
     }
     @PostMapping("/deleteBatch")

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

@@ -16,7 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 员工基本信息控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/eemployeeInfo")
@@ -44,10 +44,10 @@ public class EEmployeeInfoController {
     public AjaxResult save(@RequestBody EEmployeeInfo eemployeeInfo, MultipartFile multipartFile) {
         return service.saveEEmployeeInfo(eemployeeInfo, multipartFile)? AjaxResult.success(eemployeeInfo): AjaxResult.error("保存失败");
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "员工基本信息修改")
-    public AjaxResult upLocalDate(@RequestBody EEmployeeInfo eemployeeInfo, MultipartFile multipartFile) {
-        return service.upLocalDateEEmployeeInfo(eemployeeInfo, multipartFile)? AjaxResult.success(eemployeeInfo): AjaxResult.error("修改失败");
+    public AjaxResult update(@RequestBody EEmployeeInfo eemployeeInfo, MultipartFile multipartFile) {
+        return service.updateEEmployeeInfo(eemployeeInfo, multipartFile)? AjaxResult.success(eemployeeInfo): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "员工基本信息删除")

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

@@ -17,7 +17,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 员工合同管理控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/eemployeeMaster")
@@ -45,9 +45,9 @@ public class EEmployeeMasterController {
     public AjaxResult save(@RequestBody EEmployeeMaster eemployeeMaster) {
         return AjaxResult.success(service.save(eemployeeMaster));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "员工合同管理修改")
-    public AjaxResult upLocalDate(@RequestBody EEmployeeMaster eemployeeMaster) {
+    public AjaxResult update(@RequestBody EEmployeeMaster eemployeeMaster) {
         return AjaxResult.success(service.updateById(eemployeeMaster));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 企业基本信息控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/enterpriseInfo")
@@ -46,12 +46,12 @@ public class EEnterpriseInfoController {
     }
     @PostMapping("/save")
     @ApiOperation(value = "企业基本信息保存")
-    public AjaxResult save(@RequestBody EEnterpriseInfo houseType) {
+    public AjaxResult save(@RequestBody  EEnterpriseInfo houseType) {
         return AjaxResult.success(service.save(houseType));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "企业基本信息修改")
-    public AjaxResult upLocalDate(@RequestBody EEnterpriseInfo houseType) {
+    public AjaxResult update(@RequestBody  EEnterpriseInfo houseType) {
         return AjaxResult.success(service.updateById(houseType));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 企业用电控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/enterprisePowerInfo")
@@ -49,9 +49,9 @@ public class EEnterprisePowerInfoController {
     public AjaxResult save(@RequestBody EEnterprisePowerInfo eEnterprisePowerInfo) {
         return AjaxResult.success(service.save(eEnterprisePowerInfo));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "企业用电信息修改")
-    public AjaxResult upLocalDate(@RequestBody EEnterprisePowerInfo eEnterprisePowerInfo) {
+    public AjaxResult update(@RequestBody EEnterprisePowerInfo eEnterprisePowerInfo) {
         return AjaxResult.success(service.updateById(eEnterprisePowerInfo));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 燃气控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/egas")
@@ -49,9 +49,9 @@ public class EGasController {
     public AjaxResult save(@RequestBody EGas egas) {
         return AjaxResult.success(service.save(egas));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "燃气信息修改")
-    public AjaxResult upLocalDate(@RequestBody EGas egas) {
+    public AjaxResult update(@RequestBody EGas egas) {
         return AjaxResult.success(service.updateById(egas));
     }
     @PostMapping("/deleteBatch")

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

@@ -1,6 +1,8 @@
 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;
@@ -19,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 用水控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/ewater")
@@ -47,9 +49,9 @@ public class EWaterController {
     public AjaxResult save(@RequestBody EWater ewater) {
         return AjaxResult.success(service.save(ewater));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "用水信息修改")
-    public AjaxResult upLocalDate(@RequestBody EWater ewater) {
+    public AjaxResult update(@RequestBody EWater ewater) {
         return AjaxResult.success(service.updateById(ewater));
     }
     @PostMapping("/deleteBatch")

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 户型控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/houseType")
@@ -44,10 +44,10 @@ public class AHouseTypeController {
     public AjaxResult save(AHouseType houseType, MultipartFile multipartFile) {
         return service.saveHouseType(houseType, multipartFile)? AjaxResult.success(houseType): AjaxResult.error("保存失败");
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "户型修改")
-    public AjaxResult upLocalDate(AHouseType houseType, MultipartFile multipartFile) {
-        return service.upLocalDateHouseType(houseType, multipartFile)? AjaxResult.success(houseType): AjaxResult.error("修改失败");
+    public AjaxResult update(AHouseType houseType, MultipartFile multipartFile) {
+        return service.updateHouseType(houseType, multipartFile)? AjaxResult.success(houseType): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")
     @ApiOperation(value = "户型删除")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 标准化厂房收入情况控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/apropertyReceipt")
@@ -49,9 +49,9 @@ public class APropertyReceiptController {
     public AjaxResult save(@RequestBody APropertyReceipt eAdminLicenseInfo) {
         return AjaxResult.success(service.save(eAdminLicenseInfo));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "标准化厂房收入情况信息修改")
-    public AjaxResult upLocalDate(@RequestBody APropertyReceipt eAdminLicenseInfo) {
+    public AjaxResult update(@RequestBody APropertyReceipt eAdminLicenseInfo) {
         return AjaxResult.success(service.updateById(eAdminLicenseInfo));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 公租房租赁情况控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/apublicRentalHousing")
@@ -49,9 +49,9 @@ public class APublicRentalHousingController {
     public AjaxResult save(@RequestBody APublicRentalHousing eAdminLicenseInfo) {
         return AjaxResult.success(service.save(eAdminLicenseInfo));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "公租房租赁情况信息修改")
-    public AjaxResult upLocalDate(@RequestBody APublicRentalHousing eAdminLicenseInfo) {
+    public AjaxResult update(@RequestBody APublicRentalHousing eAdminLicenseInfo) {
         return AjaxResult.success(service.updateById(eAdminLicenseInfo));
     }
     @PostMapping("/deleteBatch")

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

@@ -21,7 +21,7 @@ import java.util.Arrays;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 公租房租赁情况控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/arentalProperty")
@@ -49,9 +49,9 @@ public class ARentalPropertyController {
     public AjaxResult save(@RequestBody ARentalProperty arentalProperty) {
         return AjaxResult.success(service.save(arentalProperty));
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "公租房租赁情况信息修改")
-    public AjaxResult upLocalDate(@RequestBody ARentalProperty arentalProperty) {
+    public AjaxResult update(@RequestBody ARentalProperty arentalProperty) {
         return AjaxResult.success(service.updateById(arentalProperty));
     }
     @PostMapping("/deleteBatch")

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

@@ -16,7 +16,7 @@ import java.util.List;
  * @version 1.0
  * @project enterprise-assets-service
  * @description 房间控制层
- * @LocalDate 2025/6/24 14:33:13
+ * @date 2025/6/24 14:33:13
  */
 @RestController
 @RequestMapping("/aroom")
@@ -34,14 +34,14 @@ public class ARoomController {
     public AjaxResult save(ARoom houseType, MultipartFile multipartFile) {
         return service.saveARoom(houseType,multipartFile)? AjaxResult.success(houseType): AjaxResult.error("保存失败");
     }
-    @PostMapping("/upLocalDate")
+    @PostMapping("/update")
     @ApiOperation(value = "房间修改")
-    public AjaxResult upLocalDate(ARoom aRoom, MultipartFile multipartFile) {
-        return service.upLocalDateARoom(aRoom,multipartFile)? AjaxResult.success(aRoom): AjaxResult.error("修改失败");
+    public AjaxResult update(ARoom aRoom, MultipartFile multipartFile) {
+        return service.updateARoom(aRoom,multipartFile)? AjaxResult.success(aRoom): AjaxResult.error("修改失败");
     }
-    @PostMapping("/upLocalDateBatch")
+    @PostMapping("/updateBatch")
     @ApiOperation(value = "房间批量修改按钮属性")
-    public AjaxResult upLocalDateBatch(@RequestBody List<ARoom> aRoomList) {
+    public AjaxResult updateBatch(List<ARoom> aRoomList) {
         return service.updateBatchById(aRoomList)? AjaxResult.success(aRoomList): AjaxResult.error("修改失败");
     }
     @PostMapping("/deleteBatch")

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

@@ -0,0 +1,115 @@
+package com.zksy.info.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 员工合同管理表
+ * @TableName e_employee_master
+ */
+@TableName(value ="e_employee_master")
+@Data
+public class EEmployeeMaster implements Serializable {
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 员工工号
+     */
+    @ApiModelProperty(value = "员工工号")
+    private String employeeNo;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "姓名")
+    private String fullName;
+
+    /**
+     * 入职日期
+     */
+    @ApiModelProperty(value = "入职日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date hireDate;
+
+    /**
+     * 离职日期
+     */
+    @ApiModelProperty(value = "离职日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date terminationDate;
+
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+    /**
+     * 当前合同编号
+     */
+    @ApiModelProperty(value = "当前合同编号")
+    private String contractNo;
+
+    /**
+     * 合同类型
+     */
+    @ApiModelProperty(value = "合同类型")
+    private String contractType;
+
+    /**
+     * 合同开始日期
+     */
+    @ApiModelProperty(value = "合同开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date contractStartDate;
+
+    /**
+     * 合同结束日期
+     */
+    @ApiModelProperty(value = "合同结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date contractEndDate;
+
+    /**
+     * 合同状态
+     */
+    @ApiModelProperty(value = "合同状态('有效', '已到期', '已解除', '已终止')")
+    private String contractStatus;
+
+    /**
+     * 工资
+     */
+    @ApiModelProperty(value = "工资")
+    private BigDecimal salary;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/zksy/info/mapper/EEmployeeMasterMapper.java

@@ -0,0 +1,18 @@
+package com.zksy.info.mapper;
+
+import com.zksy.info.domain.EEmployeeMaster;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【e_employee_master(员工合同管理表)】的数据库操作Mapper
+* @createDate 2025-06-27 15:57:22
+* @Entity com.zksy.info.domain.EEmployeeMaster
+*/
+public interface EEmployeeMasterMapper extends BaseMapper<EEmployeeMaster> {
+
+}
+
+
+
+

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

@@ -0,0 +1,18 @@
+package com.zksy.info.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.info.domain.EEmployeeMaster;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【e_employee_master(员工合同管理表)】的数据库操作Service
+* @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);
+
+}

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

@@ -0,0 +1,48 @@
+package com.zksy.info.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.info.domain.EEmployeeMaster;
+import com.zksy.info.service.EEmployeeMasterService;
+import com.zksy.info.mapper.EEmployeeMasterMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【e_employee_master(员工合同管理表)】的数据库操作Service实现
+* @createDate 2025-06-27 15:57:22
+*/
+@Service
+public class EEmployeeMasterServiceImpl extends ServiceImpl<EEmployeeMasterMapper, EEmployeeMaster>
+    implements EEmployeeMasterService{
+
+    @Override
+    public Page<EEmployeeMaster> findByPage(long pageNum, long pageSize, String workNumber, 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(fullName != null ,EEmployeeMaster::getFullName,fullName);
+        queryWrapper.like(contractNo != null ,EEmployeeMaster::getContractNo,contractNo);
+        queryWrapper.orderByDesc(EEmployeeMaster::getUpdateTime);
+        Page<EEmployeeMaster> pageResult = this.page(page, queryWrapper);
+        return pageResult;
+    }
+
+    @Override
+    public List<EEmployeeMaster> getEEmployeeMasterList(String workNumber, String fullName, String contractNo) {
+        LambdaQueryWrapper<EEmployeeMaster> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.like(workNumber != null ,EEmployeeMaster::getEmployeeNo,workNumber);
+        queryWrapper.like(fullName != null ,EEmployeeMaster::getFullName,fullName);
+        queryWrapper.like(contractNo != null ,EEmployeeMaster::getContractNo,contractNo);
+        queryWrapper.orderByDesc(EEmployeeMaster::getUpdateTime);
+        List<EEmployeeMaster> list = this.list(queryWrapper);
+        return list;
+    }
+}
+
+
+
+

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -56,8 +56,8 @@ public class AHouseType implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDate createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
 
     /**
      * 创建人
@@ -69,14 +69,14 @@ public class AHouseType implements Serializable {
      * 修改时间
      */
     @ApiModelProperty("修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDate upLocalDateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
 
     /**
      * 修改人
      */
     @ApiModelProperty("修改人")
-    private String upLocalDateBy;
+    private String updateBy;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,7 +51,7 @@ public class ARoom implements Serializable {
      * 创建时间
      */
     @ApiModelProperty("创建时间")
-    private LocalDate createTime;
+    private Date createTime;
 
     /**
      * 创建人
@@ -63,13 +63,13 @@ public class ARoom implements Serializable {
      * 修改时间
      */
     @ApiModelProperty("修改时间")
-    private LocalDate upLocalDateTime;
+    private Date updateTime;
 
     /**
      * 修改人
      */
     @ApiModelProperty("修改人")
-    private String upLocalDateBy;
+    private String updateBy;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/zksy/property/mapper/AHouseTypeMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
 * @author Administrator
 * @description 针对表【a_house_type(户型表)】的数据库操作Mapper
-* @createLocalDate 2025-06-24 16:24:28
+* @createDate 2025-06-24 16:24:28
 * @Entity com.zksy.property.domain.AHouseType
 */
 @Mapper

src/main/java/com/zksy/property/mapper/ARoomMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
 * @author Administrator
 * @description 针对表【a_room(房间表)】的数据库操作Mapper
-* @createLocalDate 2025-06-26 09:44:49
+* @createDate 2025-06-26 09:44:49
 * @Entity com.zksy.property.domain.ARoom
 */
 public interface ARoomMapper extends BaseMapper<ARoom> {

src/main/java/com/zksy/property/service/AHouseTypeService.java

@@ -10,12 +10,12 @@ import java.util.List;
 /**
 * @author Administrator
 * @description 针对表【a_house_type(户型表)】的数据库操作Service
-* @createLocalDate 2025-06-24 16:24:28
+* @createDate 2025-06-24 16:24:28
 */
 public interface AHouseTypeService extends IService<AHouseType> {
         List<AHouseType> getHouseTypeList(String accountNumber);
         Page<AHouseType> findByPage(long pageNum, long pageSize, String accountNumber);
         boolean saveHouseType(AHouseType houseType, MultipartFile multipartFile);
-        boolean upLocalDateHouseType(AHouseType houseType, MultipartFile multipartFile);
+        boolean updateHouseType(AHouseType houseType, MultipartFile multipartFile);
         boolean removeBatchHouseType(String[] ids);
 }

src/main/java/com/zksy/property/service/ARoomService.java

@@ -9,12 +9,12 @@ import java.util.List;
 /**
 * @author Administrator
 * @description 针对表【a_room(房间表)】的数据库操作Service
-* @createLocalDate 2025-06-26 09:44:49
+* @createDate 2025-06-26 09:44:49
 */
 public interface ARoomService extends IService<ARoom> {
 
     List<ARoom> getByHouseTypeId(String houseTypeId);
     boolean saveARoom(ARoom aRoom, MultipartFile multipartFile);
-    boolean upLocalDateARoom(ARoom aRoom, MultipartFile multipartFile);
+    boolean updateARoom(ARoom aRoom, MultipartFile multipartFile);
     boolean removeBatchARoom(String[] ids);
 }

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

@@ -21,7 +21,7 @@ import java.util.List;
 /**
 * @author Administrator
 * @description 针对表【a_house_type(户型表)】的数据库操作Service实现
-* @createLocalDate 2025-06-24 16:24:28
+* @createDate 2025-06-24 16:24:28
 */
 @Service
 public class AHouseTypeServiceImpl extends ServiceImpl<AHouseTypeMapper, AHouseType>
@@ -37,7 +37,7 @@ public class AHouseTypeServiceImpl extends ServiceImpl<AHouseTypeMapper, AHouseT
     public List<AHouseType> getHouseTypeList(String accountNumber) {
         LambdaQueryWrapper<AHouseType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.like(accountNumber != null,AHouseType::getAccountNumber,accountNumber);
-        lambdaQueryWrapper.orderByDesc(AHouseType::getUpLocalDateTime);
+        lambdaQueryWrapper.orderByDesc(AHouseType::getUpdateTime);
         List<AHouseType> list = mapper.selectList(lambdaQueryWrapper);
         return list;
     }
@@ -47,7 +47,7 @@ public class AHouseTypeServiceImpl extends ServiceImpl<AHouseTypeMapper, AHouseT
         Page<AHouseType> page = new Page<>(pageNum,pageSize);
         QueryWrapper<AHouseType> queryWrapper = new QueryWrapper();
         queryWrapper.like(accountNumber != null ,"account_number",accountNumber);
-        queryWrapper.orderByDesc("upLocalDate_time");
+        queryWrapper.orderByDesc("update_time");
         Page<AHouseType> page1 = mapper.selectPage(page, queryWrapper);
         return page1;
     }
@@ -69,7 +69,7 @@ public class AHouseTypeServiceImpl extends ServiceImpl<AHouseTypeMapper, AHouseT
 
     @Override
     @Transactional
-    public boolean upLocalDateHouseType(AHouseType houseType, MultipartFile multipartFile) {
+    public boolean updateHouseType(AHouseType houseType, MultipartFile multipartFile) {
         try {
             if (multipartFile != null) {
                 // 删除minio文件

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

@@ -18,7 +18,7 @@ import java.util.List;
 /**
 * @author Administrator
 * @description 针对表【a_room(房间表)】的数据库操作Service实现
-* @createLocalDate 2025-06-26 09:44:49
+* @createDate 2025-06-26 09:44:49
 */
 @Service
 public class ARoomServiceImpl extends ServiceImpl<ARoomMapper, ARoom>
@@ -53,7 +53,7 @@ public class ARoomServiceImpl extends ServiceImpl<ARoomMapper, ARoom>
 
     @Override
     @Transactional
-    public boolean upLocalDateARoom(ARoom aRoom, MultipartFile multipartFile) {
+    public boolean updateARoom(ARoom aRoom, MultipartFile multipartFile) {
         try {
             if (multipartFile != null) {
                 // 删除minio文件

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

@@ -1,23 +0,0 @@
-package com.zksy.utils;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.math.BigInteger;
-
-@Configuration
-@ConditionalOnClass(ObjectMapper.class)
-public class JsonConfig {
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() {
-        return jacksonObjectMapperBuilder -> {
-            // long -> string
-            jacksonObjectMapperBuilder.serializerByType(Long.class, ToStringSerializer.instance);
-            jacksonObjectMapperBuilder.serializerByType(BigInteger.class, ToStringSerializer.instance);
-        };
-    }
-}

src/main/resources/application-prod.yml

@@ -33,7 +33,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://10.0.114.7:3307/enterprise_assets?useUnicode=true&characterEncoding=utf8&zeroLocalDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://10.0.114.7:3307/enterprise_assets?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: 123456
       # 从库数据源

src/main/resources/mapper/common/FileManagerMapper.xml

@@ -14,8 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fileSize" column="file_size" jdbcType="DOUBLE"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-        <result property="upLocalDateBy" column="upLocalDate_by" jdbcType="VARCHAR"/>
-        <result property="upLocalDateTime" column="upLocalDate_time" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         id,fid,module_name,
         file_original_name,file_url,file_name,
         file_size,create_by,create_time,
-        upLocalDate_by,upLocalDate_time,is_delete
+        update_by,update_time,is_delete
     </sql>
 
 </mapper>

src/main/resources/mapper/info/EArchivesAdministrationMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.info.mapper.EArchivesAdministrationMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.info.domain.EArchivesAdministration">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="workNumber" column="work_number" jdbcType="VARCHAR"/>
+            <result property="fullName" column="full_name" jdbcType="VARCHAR"/>
+            <result property="type" column="type" jdbcType="VARCHAR"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,work_number,full_name,type,
+        remark,create_time,create_by,
+        update_time,update_by
+    </sql>
+</mapper>

src/main/resources/mapper/info/EEmployeeMasterMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zksy.info.mapper.EEmployeeMasterMapper">
+
+    <resultMap id="BaseResultMap" type="com.zksy.info.domain.EEmployeeMaster">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="employeeNo" column="employee_no" jdbcType="VARCHAR"/>
+            <result property="fullName" column="full_name" jdbcType="VARCHAR"/>
+            <result property="hireDate" column="hire_date" jdbcType="DATE"/>
+            <result property="terminationDate" column="termination_date" jdbcType="DATE"/>
+            <result property="contactPhone" column="contact_phone" jdbcType="VARCHAR"/>
+            <result property="contractNo" column="contract_no" jdbcType="VARCHAR"/>
+            <result property="contractType" column="contract_type" jdbcType="VARCHAR"/>
+            <result property="contractStartDate" column="contract_start_date" jdbcType="DATE"/>
+            <result property="contractEndDate" column="contract_end_date" jdbcType="DATE"/>
+            <result property="contractStatus" column="contract_status" jdbcType="OTHER"/>
+            <result property="salary" column="salary" jdbcType="DECIMAL"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,employee_no,full_name,
+        hire_date,termination_date,contact_phone,
+        contract_no,contract_type,contract_start_date,
+        contract_end_date,contract_status,salary,
+        create_time,update_time
+    </sql>
+</mapper>

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

@@ -12,13 +12,13 @@
             <result property="accountUrl" column="account_url" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="upLocalDateTime" column="upLocalDate_time" jdbcType="TIMESTAMP"/>
-            <result property="upLocalDateBy" column="upLocalDate_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,account_number,address,
         area,create_time,create_by,
-        upLocalDate_time,upLocalDate_by
+        update_time,update_by
     </sql>
 </mapper>

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

@@ -12,13 +12,13 @@
             <result property="attribute" column="attribute" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
-            <result property="upLocalDateTime" column="upLocalDate_time" jdbcType="TIMESTAMP"/>
-            <result property="upLocalDateBy" column="upLocalDate_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,house_type_id,room_number,
         room_picture_url,attribute,create_time,create_by,
-        upLocalDate_time,upLocalDate_by
+        update_time,update_by
     </sql>
 </mapper>