Merge remote-tracking branch 'origin/dev' into dev

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

@@ -267,4 +267,29 @@ public class MaterialTaskController {
         materialTaskService.updateById(materialTask);
         return R.ok(true);
     }
+
+    @GetMapping(value = "/assign-list")
+    @ApiOperation(value = "审核分员列表")
+    @SaCheckPermission("materialtask:detail")
+    public RT<List<MaterialTaskAssignListVo>> assignList(@Valid MaterialTaskAssignListDto dto) {
+
+        MPJLambdaWrapper<MaterialTaskAssign> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .distinct()
+                .disableSubLogicDel()
+                .eq(MaterialTaskAssign::getMaterialTaskId, dto.getMaterialTaskId())
+                .eq(dto.getState() == 1, MaterialTaskAssign::getStatus, 2)
+                .eq(dto.getState() == 2, MaterialTaskAssign::getExecutiveStatus, 1)
+                .eq(dto.getState() == 3, MaterialTaskAssign::getStatus, 3)
+                .select(MaterialTaskAssign::getId)
+                .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(MaterialTaskAppendix.class, MaterialTaskAppendix::getMaterialTaskId, MaterialTaskAssign::getId)
+                .leftJoin(File.class, File::getId, MaterialTaskAppendix::getFileId)
+                .selectAs(File::getFolderId, MaterialTaskAssignListVo::getFolderId);
+        List<MaterialTaskAssignListVo> pageOutput = materialTaskAssignService.selectJoinList(MaterialTaskAssignListVo.class, queryWrapper);
+        return RT.ok(pageOutput);
+    }
 }

src/main/java/com/xjrsoft/module/material/dto/MaterialTaskAssignListDto.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.material.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MaterialTaskAssignListDto {
+    /**
+     * 材料提交任务(material_task)
+     */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+     * 1=待审核 2=未提交 3=已审核
+     */
+    private Integer state;
+}

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

@@ -142,7 +142,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
             Integer oldStatus = materialTaskAssign.getStatus();
             if (oldStatus == 1) {
                 materialTaskAssign.setStatus(2);
-                MaterialTask materialTask = materialTaskMaterialTaskMapper.selectByIdDeep(materialTaskAssign.getTransferMaterialTaskId());
+                MaterialTask materialTask = materialTaskMaterialTaskMapper.selectByIdDeep(materialTaskAssign.getMaterialTaskId());
                 if (LocalDate.now().compareTo(materialTask.getRequiredCompleteTime()) > 0) {
                     materialTaskAssign.setExecutiveStatus(2);
                     materialTask.setOnTimePerson(materialTask.getOnTimePerson() + 1);

src/main/java/com/xjrsoft/module/material/vo/MaterialTaskAssignListVo.java

@@ -0,0 +1,51 @@
+package com.xjrsoft.module.material.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class MaterialTaskAssignListVo {
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+     * 材料提交任务(material_task)
+     */
+    @ApiModelProperty("材料提交任务(material_task)")
+    private Long materialTaskId;
+    /**
+     * 用户(xjr_user)
+     */
+    @ApiModelProperty("用户(xjr_user)")
+    private Long userId;
+    /**
+     * 用户类型 1=孝职工 2=学生
+     */
+    @ApiModelProperty("用户类型 1=孝职工 2=学生")
+    private Integer userType;
+    /**
+     * 学号/工号
+     */
+    @ApiModelProperty("学号/工号")
+    private String userNumber;
+    /**
+     * 状态 1=未提交 2=待审核 3=通过 4=重做
+     */
+    @ApiModelProperty("状态 1=未提交 2=待审核 3=通过 4=重做")
+    private Integer status;
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 部门
+     */
+    private String deptName;
+    /**
+     * 文件包
+     */
+    private String folderId;
+}