修改接口

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

@@ -241,4 +241,14 @@ public class MaterialTaskController {
         materialTaskAssignService.updateById(materialTaskAssign);
         return R.ok(true);
     }
+
+    @PutMapping("/end")
+    @ApiOperation(value = "提交材料结束 enabledMark 不用传")
+    public R end(@Valid @RequestBody UpdateEnableMarkDto dto) {
+        MaterialTask materialTask  = new MaterialTask();
+        materialTask.setId(dto.getId());
+        materialTask.setStatus(3);
+        materialTaskService.updateById(materialTask);
+        return R.ok(true);
+    }
 }

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

@@ -154,19 +154,19 @@ public class MaterialTypeController {
     @GetMapping(value = "/assign-page")
     @ApiOperation(value="材料提交任务类型权限列表(分页)")
     @SaCheckPermission("materialtype:detail")
-    public RT<PageOutput<MaterialTypeAssignVo>> assignPage(@Valid MaterialTypeAssignPageDto dto){
+    public RT<PageOutput<MaterialTypeAssignVo>> assignPage(@Valid MaterialTypeAssignPageDto dto) {
 
         MPJLambdaWrapper<MaterialTypeAssign> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableSubLogicDel()
-                .eq(MaterialTypeAssign::getMaterialTypeId,dto.getMaterialTypeId())
+                .eq(ObjectUtil.isNotEmpty(dto.getMaterialTypeId()) && dto.getMaterialTypeId() > 0, MaterialTypeAssign::getMaterialTypeId, dto.getMaterialTypeId())
                 .select(MaterialTypeAssign::getId)
-                .selectAs(MaterialType::getName,MaterialTypeAssignVo::getMaterialTypeName)
-                .leftJoin(MaterialType.class,MaterialType::getId,MaterialTypeAssign::getMaterialTypeId)
+                .selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName)
+                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId)
 //                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
-                .innerJoin(XjrUser.class,XjrUser::getId,MaterialTypeAssign::getUserId,ext->ext.selectAs(XjrUser::getUserName,MaterialTypeAssignVo::getUserName))
-                .leftJoin(UserDeptRelation.class,UserDeptRelation::getUserId,MaterialTypeAssign::getUserId)
-                .leftJoin(Department.class,Department::getId,UserDeptRelation::getDeptId,ext->ext.selectAs(Department::getName,MaterialTypeAssignVo::getDeptName))
+                .innerJoin(XjrUser.class, XjrUser::getId, MaterialTypeAssign::getUserId, ext -> ext.selectAs(XjrUser::getUserName, MaterialTypeAssignVo::getUserName))
+                .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, MaterialTypeAssign::getUserId)
+                .leftJoin(Department.class, Department::getId, UserDeptRelation::getDeptId, ext -> ext.selectAs(Department::getName, MaterialTypeAssignVo::getDeptName))
         ;
 
         IPage<MaterialTypeAssign> page = materialTypeAssignService.page(ConventPage.getPage(dto), queryWrapper);