Browse Source

添加返回名称

DESKTOP-USV654P\pc 1 year ago
parent
commit
0525aa5055

+ 3 - 1
src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -161,7 +161,9 @@ public class MaterialTypeController {
                 .disableSubLogicDel()
                 .eq(MaterialTypeAssign::getMaterialTypeId,dto.getMaterialTypeId())
                 .select(MaterialTypeAssign::getId)
-                .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
+                .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))

+ 7 - 0
src/main/java/com/xjrsoft/module/material/dto/MaterialTaskAssignAppendixDto.java

@@ -0,0 +1,7 @@
+package com.xjrsoft.module.material.dto;
+
+import lombok.Data;
+
+@Data
+public class MaterialTaskAssignAppendixDto {
+}

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

@@ -55,4 +55,10 @@ public class MaterialTypeAssignVo {
     @ApiModelProperty("部门")
     private String deptName;
 
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty("类型名称")
+    private String materialTypeName;
+
 }