合同签订日期字段修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/ContractController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -117,8 +118,8 @@ public class ContractController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "维保合同分页查询", notes = "维保合同分页查询")
     public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, Long companyId, Long signedCompanyId, String name, Long typeCode,
-                                                         Date signedDate) {
-        Page<ContractDto> page = new Page<ContractDto>();
+                                                         String signedDate) {
+        Page<ContractDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         AgencyUserModel amosUser = getUserInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ContractServiceImpl.java

@@ -47,7 +47,7 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
      * 分页查询
      */
     public Page<ContractDto> queryForContractPage(Page<ContractDto> page, Boolean isDelete, Long companyId,
-                                                  Long signedCompanyId, String name, Long typeCode, Date signedDate,
+                                                  Long signedCompanyId, String name, Long typeCode, String signedDate,
                                                   String amosUserId) {
         if (ValidationUtil.isEmpty(companyId)) {
             MaintenanceCompany company = maintenanceCompanyService.getMaintenanceCompany(amosUserId);
@@ -62,7 +62,7 @@ public class ContractServiceImpl extends BaseService<ContractDto, Contract, Cont
                                                   @Condition(Operator.eq) Long signedCompanyId,
                                                   @Condition(Operator.like) String name,
                                                   @Condition(Operator.eq) Long typeCode,
-                                                  @Condition(Operator.likeLeft) Date signedDate) {
+                                                  @Condition(Operator.likeRight) String signedDate) {
         return this.queryForPage(page, null, false, isDelete, companyId, signedCompanyId, name, typeCode, signedDate);
     }