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

个人周报填报查询修改

Browse Source
This commit is contained in:
zty 2024-07-05 09:27:53 +08:00
parent 0e436597da
commit 509594adc0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/xqopen/kehui/mapper/xml/ProjectWeeklyDao.xml
View File

@ -21,10 +21,12 @@
workload,this_week,next_week, workload,this_week,next_week,
weekly_type,is_deleted,is_complete weekly_type,is_deleted,is_complete
</sql> </sql>
<select id="getList" resultType="map"> <select id="getList" resultType="com.xqopen.kehui.project.dto.ProjectWeeklyDto">
select pw.*,pm.person_name as name from project_weekly pw 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 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 personal_member pm on pm.id_ =sl.userinfo_id
left join project_info pi on pi.id_=cast(pw.project_id as BIGINT)
where where
pw.is_deleted='0' and pw.is_complete='0' pw.is_deleted='0' and pw.is_complete='0'
<if test="projectWeekly.getId!=null"> <if test="projectWeekly.getId!=null">

3
src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java
View File

@ -42,7 +42,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
/** /**
* 新增周报填报 * 新增周报填报
* *
* @param projectWeekly * @param projectWeeklyAddReq
* @return * @return
* @throws XQException * @throws XQException
*/ */
@ -103,6 +103,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
projectWeekly.setIsComplete("0"); projectWeekly.setIsComplete("0");
projectWeekly.setIsDeleted("0"); projectWeekly.setIsDeleted("0");
projectWeekly.setUserId(String.valueOf(userId)); projectWeekly.setUserId(String.valueOf(userId));
projectWeekly.setWeeklyType("0");
List<ProjectWeeklyDto> list = projectWeeklyService.getList(page, projectWeekly); List<ProjectWeeklyDto> list = projectWeeklyService.getList(page, projectWeekly);
ProjectWeeklyListResp listResp = new ProjectWeeklyListResp(); ProjectWeeklyListResp listResp = new ProjectWeeklyListResp();
listResp.setLs(list); listResp.setLs(list);

7
src/main/java/com/xqopen/kehui/project/dto/ProjectWeeklyDto.java
View File

@ -4,7 +4,8 @@ import com.xqopen.kehui.project.entity.ProjectWeekly;
import lombok.Data; import lombok.Data;
@Data @Data
public class ProjectWeeklyDto { public class ProjectWeeklyDto extends ProjectWeekly {
String name; String userName;
ProjectWeekly projectWeekly; String projectName;
String projectNo;
} }