修改材料缴交导出与查询

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -215,13 +215,13 @@ public class MaterialTaskController {
             excelVo.setDeptName(listVo.getDeptName());
             //状态 1=未提交 2=待审核 3=通过 4=重做
             String state = "";
-            if(listVo.getStatus() != null && listVo.getUserType() == 1){
+            if(listVo.getStatus() != null && listVo.getStatus() == 1){
                 state = "未提交";
-            }else if(listVo.getStatus() != null && listVo.getUserType() == 2){
+            }else if(listVo.getStatus() != null && listVo.getStatus() == 2){
                 state = "待审核";
-            }else if(listVo.getStatus() != null && listVo.getUserType() == 3){
+            }else if(listVo.getStatus() != null && listVo.getStatus() == 3){
                 state = "通过";
-            }else if(listVo.getStatus() != null && listVo.getUserType() == 4){
+            }else if(listVo.getStatus() != null && listVo.getStatus() == 4){
                 state = "重做";
             }
             excelVo.setStatus(state);

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

@@ -461,7 +461,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 //                .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(MaterialTaskAppendix.class,on-> on.eq(MaterialTaskAppendix::getMaterialTaskId, MaterialTaskAssign::getId).eq(MaterialTaskAppendix::getDeleteMark,DeleteMark.NODELETE.getCode()) )
                 .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId)
                 .like(dto.getName() != null && !"".equals(dto.getName()), XjrUser::getName, dto.getName())
                 .eq(MaterialTaskAssign::getMaterialTaskId, dto.getMaterialTaskId())
@@ -470,7 +470,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 //                .eq(Department::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTask::getDeleteMark, DeleteMark.NODELETE.getCode())
                 .eq(MaterialTaskAssign::getDeleteMark, DeleteMark.NODELETE.getCode())
-                .eq(MaterialTaskAppendix::getDeleteMark, DeleteMark.NODELETE.getCode())
+//                .eq(MaterialTaskAppendix::getDeleteMark, DeleteMark.NODELETE.getCode())
 //                .select("(\n" +
 //                        "SELECT id FROM xjr_file WHERE id IN (\n" +
 //                        "SELECT file_id FROM material_task_appendix WHERE material_task_id = t.id\n" +