质量等级修改

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/QualityGradeEntity.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.scheduling.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -34,6 +35,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import java.io.Serial;
+import java.util.List;
 
 /**
  * 质量等级表 实体类
@@ -61,4 +63,9 @@ public class QualityGradeEntity extends BaseEntity {
 	@Schema(description = "类型 1-军品 2-商飞 3-宇航")
 	private String type;
 
+	private String typeNames;
+
+	@TableField(exist = false)
+	private List<String> types;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/WorkTankExcel.java

@@ -34,7 +34,7 @@ public class WorkTankExcel implements Serializable {
 	 * [作业槽]编码
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("[作业槽]编码")
+	@ExcelProperty("编码")
 	private String workTankCode;
 	/**
 	 * [作业槽]类型
@@ -46,7 +46,7 @@ public class WorkTankExcel implements Serializable {
 	 * [作业槽]名称
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("[作业槽]名称")
+	@ExcelProperty("名称")
 	private String name;
 	/**
 	 * 排序
@@ -76,13 +76,13 @@ public class WorkTankExcel implements Serializable {
 	 * 描述
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("描述")
+	@ExcelProperty("作业槽描述")
 	private String desc;
 	/**
 	 * 操作[用户]id
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("操作[用户]")
+	@ExcelProperty("操作人")
 //	private BigDecimal opUserId;
 	private String opUserName;
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/QualityGradeController.java

@@ -43,15 +43,22 @@ import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
+import org.springblade.desk.basic.pojo.entity.WorkCenter;
+import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
 import org.springblade.scheduling.pojo.entity.QualityGradeEntity;
 import org.springblade.scheduling.scheduling.excel.QualityGradeExcel;
 import org.springblade.scheduling.scheduling.service.IQualityGradeService;
 import org.springblade.scheduling.scheduling.vo.QualityGradeVO;
 import org.springblade.scheduling.scheduling.wrapper.QualityGradeWrapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 质量等级表 控制器
@@ -75,6 +82,8 @@ public class QualityGradeController extends BladeController {
 	@Operation(summary = "详情", description  = "传入QualityGrade")
 	public R<QualityGradeVO> detail(QualityGradeEntity QualityGrade) {
 		QualityGradeEntity detail = qualityGradeService.getOne(Condition.getQueryWrapper(QualityGrade));
+		List<String> result = Arrays.asList(detail.getType().split(","));
+		detail.setTypes(result);
 		return R.data(QualityGradeWrapper.build().entityVO(detail));
 	}
 	/**
@@ -105,8 +114,31 @@ public class QualityGradeController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入QualityGrade")
-	public R save(@Valid @RequestBody QualityGradeEntity QualityGrade) {
-		return R.status(qualityGradeService.save(QualityGrade));
+	public R save(@Valid @RequestBody QualityGradeEntity qualityGrade) {
+
+		List<String> names = new ArrayList<>();
+		List<String> types = qualityGrade.getTypes();
+		for(String type: types){
+			if("1".equals( type)){
+				names.add("军品");
+			}
+			if("2".equals( type)){
+				names.add("商飞");
+			}
+			if("3".equals( type)){
+				names.add("宇航");
+			}
+		}
+
+		String result = types.stream()
+				.map(Object::toString)
+				.collect(Collectors.joining(","));
+		String name = names.stream()
+				.map(Object::toString)
+				.collect(Collectors.joining(","));
+		qualityGrade.setType(result);
+		qualityGrade.setTypeNames(name);
+		return R.status(qualityGradeService.save(qualityGrade));
 	}
 
 	/**
@@ -115,10 +147,41 @@ public class QualityGradeController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入QualityGrade")
-	public R update(@Valid @RequestBody QualityGradeEntity QualityGrade) {
-		return R.status(qualityGradeService.updateById(QualityGrade));
+	public R update(@Valid @RequestBody QualityGradeEntity qualityGrade) {
+
+		List<String> names = new ArrayList<>();
+		List<String> types = qualityGrade.getTypes();
+		for(String type: types){
+			if("1".equals( type)){
+				names.add("军品");
+			}
+			if("2".equals( type)){
+				names.add("商飞");
+			}
+			if("3".equals( type)){
+				names.add("宇航");
+			}
+		}
+
+		String result = types.stream()
+				.map(Object::toString)
+				.collect(Collectors.joining(","));
+		String name = names.stream()
+				.map(Object::toString)
+				.collect(Collectors.joining(","));
+		qualityGrade.setType(result);
+		qualityGrade.setTypeNames(name);
+		return R.status(qualityGradeService.updateById(qualityGrade));
 	}
 
+	@GetMapping("/getGrades")
+	@ApiOperationSupport(order = 31)
+	@Operation(summary = "获取质量等级表", description = "")
+	public R<List<QualityGradeEntity>> getGrades() {
+		QueryWrapper<QualityGradeEntity> queryWrapper = new QueryWrapper<>();
+		List<QualityGradeEntity> teams = qualityGradeService.list(queryWrapper);
+		return R.data(teams);
+	}
 	/**
 	 * 质量等级表 新增或修改
 	 */

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/QualityGradeMapper.xml

@@ -22,7 +22,7 @@
         <where>
             is_deleted = 0
             <if test="param2.type !=null and param2.type != ''">
-                and type = #{param2.type}
+                and type  LIKE '%' || #{param2.type} || '%';
             </if>
         </where>
     </select>