材料提交任务类型列表(权限)

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

@@ -114,8 +114,9 @@ public class MaterialTaskController {
                 .disableLogicDel()
 //                .eq(MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .like(StrUtil.isNotBlank(dto.getName()), MaterialTask::getName, dto.getName())
+                .like(StrUtil.isNotBlank(dto.getAssignedUser()), XjrUser::getName, dto.getAssignedUser())
                 .eq(ObjectUtil.isNotEmpty(dto.getStatus()) && dto.getStatus() > 0, MaterialTask::getStatus, dto.getStatus())
-                .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
+//                .eq((ObjectUtil.isNotEmpty(dto.getMaterialTypeId())) && dto.getMaterialTypeId() > 0, MaterialTask::getMaterialTypeId, dto.getMaterialTypeId())
                 .eq((ObjectUtil.isNotEmpty(dto.getExtStatus())) && dto.getExtStatus() > 0, MaterialTaskAssign::getStatus, dto.getExtStatus())
                 .select(MaterialTask::getId)
                 .select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskWaitPageVo.class).contains(x.getProperty()))
@@ -126,13 +127,12 @@ 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))
-                .like(StrUtil.isNotBlank(dto.getAssignedUser()), XjrUser::getName, dto.getAssignedUser())
         ;
 
-        if (ObjectUtil.isNotNull(dto.getRequiredCompleteStareTime()) && ObjectUtil.isNotNull(dto.getRequiredCompleteEndTime())) {
-            queryWrapper.ge(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteStareTime());
-            queryWrapper.le(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteEndTime());
-        }
+//        if (ObjectUtil.isNotNull(dto.getRequiredCompleteStareTime()) && ObjectUtil.isNotNull(dto.getRequiredCompleteEndTime())) {
+//            queryWrapper.ge(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteStareTime());
+//            queryWrapper.le(FaceIdentifyRecords::getVerifyTime, dto.getRequiredCompleteEndTime());
+//        }
 
         IPage<MaterialTaskWaitPageVo> page = materialTaskService.selectJoinListPage(ConventPage.getPage(dto), MaterialTaskWaitPageVo.class, queryWrapper);
 

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

@@ -85,16 +85,7 @@ public class MaterialTypeController {
     @GetMapping(value = "/list")
     @ApiOperation(value="材料提交任务类型列表(权限)")
     public RT<List<MaterialTypeVo>> list() {
-
-        List<MaterialTypeVo> pageOutput = materialTypeService.selectJoinList(MaterialTypeVo.class, new MPJLambdaWrapper<MaterialType>()
-                .disableSubLogicDel()
-                //.eq(MaterialTypeAssign::getUserId, StpUtil.getLoginIdAsLong())
-                .select(MaterialType::getId)
-                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeVo.class).contains(x.getProperty()))
-                //.innerJoin(MaterialTypeAssign.class, MaterialTypeAssign::getMaterialTypeId, MaterialType::getId)
-        );
-
-        return RT.ok(pageOutput);
+        return RT.ok(materialTypeService.listMaterialTypeVo());
     }
 
     @GetMapping(value = "/info")

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

@@ -12,8 +12,8 @@ public class MaterialTaskWaitPageDto extends PageInput {
     /**
      * 材料提交任务类型(material_type)
      */
-    @ApiModelProperty("材料提交任务类型(material_type)")
-    private Long materialTypeId;
+//    @ApiModelProperty("材料提交任务类型(material_type)")
+//    private Long materialTypeId;
     /**
      * 任务名称
      */
@@ -33,16 +33,16 @@ public class MaterialTaskWaitPageDto extends PageInput {
     /**
      * 要求完成日期 开始
      */
-    @ApiModelProperty("要求完成日期 开始")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteStareTime;
+//    @ApiModelProperty("要求完成日期 开始")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private LocalDateTime requiredCompleteStareTime;
 
     /**
      * 要求完成日期 结束
      */
-    @ApiModelProperty("要求完成日期 结束")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime requiredCompleteEndTime;
+//    @ApiModelProperty("要求完成日期 结束")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private LocalDateTime requiredCompleteEndTime;
 
     /**
      * 执行状态 1=未提交 2=待审核 3=通过 4=重做

src/main/java/com/xjrsoft/module/material/service/IMaterialTypeService.java

@@ -44,4 +44,6 @@ public interface IMaterialTypeService extends MPJBaseService<MaterialType> {
     PageOutput<MaterialTypePageVo> getPage(MaterialTypePageDto dto);
 
     MaterialTypeVo getInfoById(Long id);
+
+    List<MaterialTypeVo> listMaterialTypeVo();
 }

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

@@ -24,6 +24,7 @@ import com.xjrsoft.module.material.vo.MaterialTypeVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -188,6 +189,45 @@ public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapp
         return materialTypeVo;
     }
 
+    @Override
+    public List<MaterialTypeVo> listMaterialTypeVo() {
+        List<MaterialTypeVo> pageOutput = this.selectJoinList(MaterialTypeVo.class, new MPJLambdaWrapper<MaterialType>()
+                        .disableSubLogicDel()
+                        //.eq(MaterialTypeAssign::getUserId, StpUtil.getLoginIdAsLong())
+                        .select(MaterialType::getId)
+                        .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeVo.class).contains(x.getProperty()))
+                //.innerJoin(MaterialTypeAssign.class, MaterialTypeAssign::getMaterialTypeId, MaterialType::getId)
+        );
+
+        for(MaterialTypeVo materialTypeVo : pageOutput){
+            String materialCategoryStr = materialTypeVo.getMaterialCategory();
+            String[] materialCategoryStrArr = materialCategoryStr.split(",");
+
+            for (String category : materialCategoryStrArr) {
+                if (category != null) {
+                    String categoryValue = MaterialCategoryEnum.getValue(category);
+                    if (categoryValue != null) {
+                        if (materialTypeVo.getMaterialCategoryCn() != null && materialTypeVo.getMaterialCategoryCn().length() > 0) {
+                            materialTypeVo.setMaterialCategoryCn(materialTypeVo.getMaterialCategoryCn() + "，" + categoryValue);
+                        } else {
+                            materialTypeVo.setMaterialCategoryCn(categoryValue);
+                        }
+
+                        handleFileAndTemplate(materialTypeVo, category);
+                    }
+                }
+            }
+        }
+        return pageOutput;
+    }
+
+    private void handleFileAndTemplate(MaterialTypeVo materialTypeVo, String category) {
+        MaterialTypePageVo materialTypePageVo = new MaterialTypePageVo();
+        BeanUtils.copyProperties(materialTypeVo, materialTypePageVo);
+        handleFileAndTemplate(materialTypePageVo, category);
+        BeanUtils.copyProperties(materialTypePageVo, materialTypeVo);
+    }
+
     private void handleFileAndTemplate(MaterialTypePageVo materialTypePageVo, String category) {
         if (MaterialCategoryEnum.MT0001.getCode().equals(category) && materialTypePageVo.getFolderId() != null) {
             List<File> files = getFileListByFolderId(materialTypePageVo.getFolderId());

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

@@ -101,4 +101,10 @@ public class MaterialTaskWaitPageVo {
      */
     @ApiModelProperty("审核状态 1=未提交 2=待审核 3=通过 4=重做")
     private Integer processStatus;
+
+    /**
+     * 任务类型(可多选 xjr_dictionary_detail[material_category])
+     */
+    @ApiModelProperty("任务类型(可多选 xjr_dictionary_detail[material_category])")
+    private String materialCategory;
 }