修改材料缴交查询

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -450,14 +450,16 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .distinct()
                 .select(MaterialTaskAssign::getId)
                 .selectAs(MaterialTaskAppendix::getFileId, MaterialTaskAssignListVo::getFileId)
-                .selectAs(File::getFolderId, MaterialTaskAssignListVo::getFolderId)
-                .selectAs(MaterialTaskAppendix::getFileId, MaterialTaskAssignListVo::getFormDataId)
+//                .selectAs(File::getFolderId, MaterialTaskAssignListVo::getFolderId)
+                .select("CASE t4.material_category WHEN 'MT0001' THEN t6.folder_id ELSE t5.file_id END folderId")
+                .select("(select GROUP_CONCAT(DISTINCT b.name) from xjr_user_dept_relation a left join xjr_department b on a.dept_id=b.id where a.user_id=t.user_id) as deptName")
+//                .selectAs(MaterialTaskAppendix::getFileId, MaterialTaskAssignListVo::getFormDataId)
                 .selectAs(MaterialTask::getMaterialCategory, MaterialTaskAssignListVo::getMaterialCategory)
                 .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssignListVo.class).contains(x.getProperty()))
                 .select(MaterialTaskAssign.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskAssignListVo.class).contains(x.getProperty()))
                 .innerJoin(XjrUser.class, XjrUser::getId, MaterialTaskAssign::getUserId, ext -> ext.selectAs(XjrUser::getUserName, MaterialTaskAssignListVo::getUserName))
-                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
-                .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTaskAssignListVo::getDeptName))
+//                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
+//                .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTaskAssignListVo::getDeptName))
                 .leftJoin(MaterialTask.class, MaterialTask::getId, MaterialTaskAssign::getMaterialTaskId)
                 .leftJoin(MaterialTaskAppendix.class, MaterialTaskAppendix::getMaterialTaskId, MaterialTaskAssign::getId)
                 .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId)
@@ -465,7 +467,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
                 .eq(MaterialTaskAssign::getMaterialTaskId, dto.getMaterialTaskId())
                 .eq(dto.getState() != null, MaterialTaskAssign::getStatus, dto.getState())
                 .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
-                .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
+//                .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTask::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTaskAssign::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTaskAppendix::getDeleteMark, DeleteMark.NODELETE.getCode())