diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java index e642bea..1669c2f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java @@ -41,6 +41,12 @@ private String signDirector; /** + * 签名用户id + */ + @ApiModelProperty(value = "签名用户id", dataType = "Long") + private Long signUserId; + + /** * 创建时间 */ @ApiModelProperty(value = "创建时间(开始)", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java index e642bea..1669c2f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/system/SignListRequest.java @@ -41,6 +41,12 @@ private String signDirector; /** + * 签名用户id + */ + @ApiModelProperty(value = "签名用户id", dataType = "Long") + private Long signUserId; + + /** * 创建时间 */ @ApiModelProperty(value = "创建时间(开始)", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java index b087fb0..dffd29b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java @@ -143,6 +143,7 @@ wrapper.like(StringUtils.isNotBlank(request.getSignNo()), "sign_no", request.getSignNo()); wrapper.like(StringUtils.isNotBlank(request.getSignName()), "sign_name", request.getSignName()); wrapper.like(StringUtils.isNotBlank(request.getSignDirector()), "sign_director", request.getSignDirector()); + wrapper.eq(!Objects.isNull(request.getSignUserId()), "sign_user_id", request.getSignUserId()); wrapper.apply(StringUtils.isNotBlank(request.getCreateStartTime()), "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getCreateStartTime().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getCreateEndTime()),