生产质量检验消息提醒镀种和材料接口

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java

@@ -41,8 +41,11 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.basic.excel.CoatingThicknessExcel;
+import org.springblade.desk.basic.pojo.entity.CoatingThickness;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.energy.excel.BsEpciuInspectionPointExcel;
 import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity;
@@ -54,6 +57,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -179,14 +183,24 @@ public class BsEpciuInspectionPointController extends BladeController {
 	@ApiOperationSupport(order = 11)
 	@Operation(summary = "导入Excel", description = "MultipartFile")
 	public R importExcel(@RequestParam("file") MultipartFile file) {
-		R checkR = ExcelExtUtil.importExcelCheck(file);
+		List<BsEpciuInspectionPointEntity> noticeList = new ArrayList<>();
-		if (checkR != null) {
+
-			return checkR;
+
-		}
+		List<BsEpciuInspectionPointExcel> list = ExcelUtil.read(file, BsEpciuInspectionPointExcel.class);
-		List<BsEpciuInspectionPointEntity> importList = ExcelUtil.read(
+		list.forEach(noticeExcel -> {
-				file, 0, 1, BsEpciuInspectionPointEntity.class
+			BsEpciuInspectionPointEntity notice = BeanUtil.copy(noticeExcel, BsEpciuInspectionPointEntity.class);
-		);
+			noticeList.add(notice);
-		return R.status(bsEpciuInspectionPointService.saveBatch(importList));
+		});
+
+
+//		R checkR = ExcelExtUtil.importExcelCheck(file);
+//		if (checkR != null) {
+//			return checkR;
+//		}
+//		List<BsEpciuInspectionPointEntity> importList = ExcelUtil.read(
+//				file, 0, 1, BsEpciuInspectionPointEntity.class
+//		);
+		return R.status(bsEpciuInspectionPointService.saveBatch(noticeList));
 	}
 	/**
 	 * 环保巡检点配置表 批量新增

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java

@@ -57,7 +57,7 @@ public class BsEpciuInspectionPointExcel implements Serializable {
 	 * ID
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("ID")
+//	@ExcelProperty("ID")
 	private Short id;
 	/**
 	 * 巡检点编号
@@ -75,7 +75,7 @@ public class BsEpciuInspectionPointExcel implements Serializable {
 	 * 上次巡检日期
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("上次巡检日期")
+	@ExcelProperty("上次检验日期")
 	private Date lastInsCycle;
 	/**
 	 * 备注
@@ -87,7 +87,7 @@ public class BsEpciuInspectionPointExcel implements Serializable {
 	 * 是否已删除
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
+//	@ExcelProperty("是否已删除")
 	private Long isDeleted;
 	/**
 	 * 巡检点类型

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java

@@ -70,9 +70,9 @@ public class BsSafeInspectionPointEntity extends BaseEntity {
 	/**
 	 * 巡检器
 	 */
-	@Schema(description = "巡检器")
+//	@Schema(description = "巡检器")
-	@TableField(value = "ins_num")
+//	@TableField(value = "ins_num")
-	private String patrolRegister;
+//	private String patrolRegister;
 	/**
 	 * 巡检点
 	 */
@@ -83,7 +83,7 @@ public class BsSafeInspectionPointEntity extends BaseEntity {
 	 */
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
-	@Schema(description = "上次巡检周期")
+	@Schema(description = "上次检验日期")
 	private Date lastInsCycle;
 	/**
 	 * 备注

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -214,7 +214,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
             if(null != processId && 107L == processId){
                 LambdaQueryWrapper<RemindMsg> qw = Wrappers.lambdaQuery(RemindMsg.class)
-                        .eq(RemindMsg::getPartId, parts.get(0).getId())
+                        .eq(RemindMsg::getPartCode, parts.get(0).getPartCode())
 //                        .eq(RemindMsg::getQualityLevel, prodIdent)
                         .eq(RemindMsg::getIsHeatTreatment, "1")
                         .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE)
@@ -240,7 +240,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
             if(null != processId && 21L == processId){
                 LambdaQueryWrapper<RemindMsg> qw = Wrappers.lambdaQuery(RemindMsg.class)
-                        .eq(RemindMsg::getPartId, parts.get(0).getId())
+                        .eq(RemindMsg::getPartCode, parts.get(0).getPartCode())
 //                        .eq(RemindMsg::getQualityLevel, prodIdent)
                         .eq(RemindMsg::getIsAfterPlating, "1")
                         .eq(RemindMsg::getRemindMsgType, 0L)