فهرست منبع

材料缴交我的提交

大数据与最优化研究所 1 سال پیش
والد
کامیت
3635b9419b

+ 1 - 0
src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -121,6 +121,7 @@ public class MaterialTaskController {
                 .selectAs(MaterialTaskAssign::getTransferSubmitedPerson, MaterialTaskWaitPageVo::getTransferSubmitedPerson)
                 .selectAs(MaterialTaskAssign::getStatus, MaterialTaskWaitPageVo::getProcessStatus)
                 .leftJoin(XjrUser.class, XjrUser::getId, MaterialTask::getCreateUserId, ext -> ext.selectAs(XjrUser::getName, MaterialTaskWaitPageVo::getCreateUserName))
+                .leftJoin(MaterialTaskAppendix.class, MaterialTaskAppendix::getMaterialTaskId, MaterialTaskAssign::getId, ext -> ext.selectAs(MaterialTaskAppendix::getFileId, MaterialTaskWaitPageVo::getMaterialId))
         ;
 
 //        if (ObjectUtil.isNotNull(dto.getRequiredCompleteStareTime()) && ObjectUtil.isNotNull(dto.getRequiredCompleteEndTime())) {

+ 6 - 0
src/main/java/com/xjrsoft/module/material/vo/MaterialTaskWaitPageVo.java

@@ -107,4 +107,10 @@ public class MaterialTaskWaitPageVo {
      */
     @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
     private String materialCategory;
+
+    /**
+     * 文件模板
+     */
+    @ApiModelProperty("文件模板")
+    private Long materialId;
 }