From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
index 1e8e2c5..3e90f10 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
@@ -3,12 +3,11 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.MeetConstants;
import com.doumee.dao.business.ProjectsMapper;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
-import com.doumee.dao.web.response.UserResponse;
import com.doumee.service.business.ProjectsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -44,8 +43,9 @@
insert.setEditor(projects.getEditor());
insert.setName(projects.getName());
insert.setImgurl(projects.getImgurl());
- insert.setStatus(Constants.ZERO);
+ insert.setStatus(MeetConstants.ZERO);
insert.setSortnum(projects.getSortnum());
+ insert.setCreateDate(new Date());
projectsMapper.insert(insert);
return projects.getId();
}
@@ -160,7 +160,7 @@
IPage<Projects> projectsIPage = projectsMapper.selectPage(page, queryWrapper);
if (!CollectionUtils.isEmpty(projectsIPage.getRecords())){
- String preFixPath = systemDictDataBiz.getPreFixPath(Constants.RESOURCE_PATH, Constants.PROJECTS);
+ String preFixPath = systemDictDataBiz.getPreFixPath(MeetConstants.RESOURCE_PATH, MeetConstants.PROJECTS);
projectsIPage.getRecords().forEach(s->s.setImgurlfull(StringUtils.isBlank(s.getImgurl()) ? s.getImgurl():preFixPath+s.getImgurl()));
}
return PageData.from(projectsIPage);
@@ -177,8 +177,8 @@
@Override
public List<ProjectsResponse> getProjectsList(Integer objId,Integer objType) {
return projectsMapper.getProjectsList(new QueryWrapper<ProjectsResponse>()
- .eq("ISDELETED",Constants.ZERO)
- .exists(" select 1 from project_rel p where p.PROJECT_ID = projects.id and p.OBJ_ID = "+objId+" and p.OBJ_TYPE = "+objType+" ")
+ .eq("ISDELETED",MeetConstants.ZERO)
+ .exists(" select 1 from meeting_project_rel p where p.PROJECT_ID = projects.id and p.OBJ_ID = "+objId+" and p.OBJ_TYPE = "+objType+" ")
);
}
}
--
Gitblit v1.9.3