xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

全所list

Browse Source
This commit is contained in:
chen 2024-07-17 09:35:49 +08:00
parent 108b6ffbc1
commit 0b235118c5
5 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/xqopen/kehui/mapper/ProjectWholeFirmWeeklyDao.java Normal file
View File

@ -0,0 +1,13 @@
package com.xqopen.kehui.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.xqopen.kehui.project.dto.ProjectWeeklyDto;
import com.xqopen.kehui.project.entity.ProjectWeekly;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ProjectWholeFirmWeeklyDao extends BaseMapper<ProjectWeekly> {
List<ProjectWeeklyDto> getList(@Param("page") Page<ProjectWeekly> page, @Param("projectWeekly") ProjectWeekly projectWeekly);
}

44
src/main/java/com/xqopen/kehui/mapper/xml/ProjectWholeFirmWeeklyDao.xml Normal file
View File

@ -0,0 +1,44 @@
<?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.xqopen.kehui.mapper.ProjectWholeFirmWeeklyDao">
<resultMap id="BaseResultMap" type="com.xqopen.kehui.project.entity.ProjectWeekly">
<id property="id" column="id_" jdbcType="VARCHAR"/>
<result property="projectId" column="project_id" jdbcType="VARCHAR"/>
<result property="userId" column="user_id" jdbcType="VARCHAR"/>
<result property="workload" column="workload" jdbcType="VARCHAR"/>
<result property="thisWeek" column="this_week" jdbcType="VARCHAR"/>
<result property="nextWeek" column="next_week" jdbcType="VARCHAR"/>
<result property="weeklyType" column="weekly_type" jdbcType="VARCHAR"/>
<result property="isDeleted" column="is_deleted" jdbcType="VARCHAR"/>
<result property="isComplete" column="is_complete" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id_,project_id,user_id,
workload,this_week,next_week,
weekly_type,is_deleted,is_complete
</sql>
<select id="getList" resultType="com.xqopen.kehui.project.dto.ProjectWeeklyDto">
select pw.*,pm.person_name as userName ,pi.project_name as projectName,pi.project_no as projectNo
from project_weekly pw
left join system_user_login sl on cast(pw.user_id as BIGINT)=sl.id_
left join personal_member pm on pm.id_ =sl.userinfo_id
left join project_info pi on pi.id_=cast(pw.project_id as BIGINT)
where pw.is_complete='0'
<if test="projectWeekly.Id!=null">
and pw.id_=#{projectWeekly.id}
</if>
<if test="projectWeekly.projectId!=null">
and pw.project_id=#{projectWeekly.projectId}
</if>
<if test="projectWeekly.week!=null">
and pw.week=#{projectWeekly.week}
</if>
and pw.weekly_type = '1'
</select>
</mapper>

2
src/main/java/com/xqopen/kehui/project/action/ProjectWholeFirmController.java
View File

@ -65,7 +65,7 @@ public class ProjectWholeFirmController implements ProjectWholeFirmApi {
projectWeekly.setProjectId(projectInfoService.getProId(projectWeeklyFindReq.getProjectName()));
if (!StringUtils.isEmpty(projectWeeklyFindReq.getWeek() != null))
projectWeekly.setWeek(projectWeeklyFindReq.getWeek());
List<ProjectWeeklyDto> list = projectWholeFirmService.getListByDeptId(page, projectWeekly);
List<ProjectWeeklyDto> list = projectWholeFirmService.getList(page, projectWeekly);
//判断当前账号是否是项目专员/负责人
//因为json里面存的是人事id，通过账号找不到，先把账号id转为人事id
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();

2
src/main/java/com/xqopen/kehui/project/service/IProjectWholeFirmService.java
View File

@ -9,5 +9,5 @@ import java.util.List;
public interface IProjectWholeFirmService extends IService<ProjectWeekly> {
List<ProjectWeeklyDto> getListByDeptId(Page<ProjectWeekly> page, ProjectWeekly projectWeekly);
List<ProjectWeeklyDto> getList(Page<ProjectWeekly> page, ProjectWeekly projectWeekly);
}

26
src/main/java/com/xqopen/kehui/project/service/impl/IProjectWholeFirmServiceImpl.java Normal file
View File

@ -0,0 +1,26 @@
package com.xqopen.kehui.project.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.xqopen.kehui.mapper.ProjectWeeklyDao;
import com.xqopen.kehui.mapper.ProjectWholeFirmWeeklyDao;
import com.xqopen.kehui.project.dto.ProjectWeeklyDto;
import com.xqopen.kehui.project.entity.ProjectWeekly;
import com.xqopen.kehui.project.service.IProjectDepartmentService;
import com.xqopen.kehui.project.service.IProjectWholeFirmService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class IProjectWholeFirmServiceImpl extends ServiceImpl<ProjectWeeklyDao, ProjectWeekly>
implements IProjectWholeFirmService {
@Autowired
ProjectWholeFirmWeeklyDao projectWholeFirmWeeklyDao;
@Override
public List<ProjectWeeklyDto> getList(Page<ProjectWeekly> page, ProjectWeekly projectWeekly) {
return projectWholeFirmWeeklyDao.getList(page,projectWeekly);
}
}