From 51ad03fcc8ffdb52469216558031a1bd31ed1fa6 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 23 七月 2024 09:57:47 +0800
Subject: [PATCH] 0723添加异常预警，消息推送，企业确认流程，企业自助建议反馈
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
index 7268711..96b50e0 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceCompanyLogServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.common.utils.DateUtils;
import com.project.common.utils.StringUtils;
import com.project.enforce.domain.EnforceCompanyLog;
import com.project.enforce.domain.bo.editBo.EnforceCompanyLogBo;
@@ -52,6 +53,7 @@
public Boolean insertByBo(EnforceCompanyLogBo bo)
{
EnforceCompanyLog add = Convert.convert(EnforceCompanyLog.class, bo);
+ add.setComeTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD, bo.getComeTime()));
validEntityBeforeSave(add);
return this.save(add);
}
@@ -81,7 +83,7 @@
//淇濆瓨鍓嶆牎楠�
private void validEntityBeforeSave(EnforceCompanyLog entity)
{
- if (StringUtils.isEmpty(entity.getComeDeptName()) && entity.getComeDeptId()!=null){
+ if (StringUtils.isNotEmpty(entity.getComeDeptName()) && entity.getComeDeptId()!=null){
entity.setComeDeptName(deptService.getDeptAllName(entity.getComeDeptId()));
}
}
@@ -103,7 +105,9 @@
qw.eq(StringUtils.isNotEmpty(bo.getComePhone()), "come_phone", bo.getComePhone());
qw.eq(bo.getComeDeptId() != null, "come_dept_id", bo.getComeDeptId());
qw.like(StringUtils.isNotEmpty(bo.getComeDeptName()), "come_dept_name", bo.getComeDeptName());
- qw.eq(bo.getComeTime() != null, "come_time", bo.getComeTime());
+ qw.ge(StringUtils.isNotEmpty(bo.getBeginTime()), "come_time", bo.getBeginTime());
+ qw.le(StringUtils.isNotEmpty(bo.getEndTime()), "come_time", bo.getEndTime());
+
if (StringUtils.isNotEmpty(bo.getIsAsc()) && StringUtils.isNotEmpty(bo.getOrderByColumn())){
if ("acs".equals(bo.getIsAsc())) {
qw.orderByAsc(bo.getOrderByColumn());
--
Gitblit v1.9.1