From 253679c0e91f6ff21143a2ccdc96b5f264dae831 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Sat, 28 Mar 2026 11:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=83=BD=E5=8A=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/pojo/entity/CoatingThickness.java | 5 +++++ .../scheduling/pojo/entity/CraftAbilityEntity.java | 5 ++++- .../desk/basic/controller/CraftAbilityController.java | 10 +++++++--- .../desk/basic/excel/CraftAbilityExcel.java | 6 +++--- .../desk/quality/service/CycleTestTaskService2.java | 7 +++++-- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java index 095543bf..1fe8d646 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -3,8 +3,11 @@ */ package org.springblade.desk.basic.pojo.entity; +import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -82,6 +85,8 @@ public class CoatingThickness extends BaseEntity { * 厚度 */ @Schema(description = "厚度") +// @JsonInclude(JsonInclude.Include.NON_NULL) +// @JSONField(serialzeFeatures = {SerializerFeature.WriteMapNullValue}) private BigDecimal thickness; /** * 排序 diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java index 89cbe2bc..d696ad81 100644 --- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java +++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/CraftAbilityEntity.java @@ -26,6 +26,7 @@ package org.springblade.scheduling.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; @@ -66,7 +67,7 @@ public class CraftAbilityEntity extends BaseEntity { * 设备分类 */ @Schema(description = "能力类型") - private Long wtId; + private String wtId; /** * 镀种小类 */ @@ -77,6 +78,7 @@ public class CraftAbilityEntity extends BaseEntity { private List ids; @Schema(description = "面积") + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal area; @Schema(description = "数量") @@ -97,6 +99,7 @@ public class CraftAbilityEntity extends BaseEntity { // @TableField(exist = false) private String dispatcherName; @Schema(description = "局部镀订单面积") + @JsonInclude(JsonInclude.Include.NON_NULL) private BigDecimal localArea; @Schema(description = "外协限制") private String wxLimit; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index 103eb46c..492ed33a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -136,7 +136,7 @@ public class CraftAbilityController extends BladeController { QueryWrapper qw = Condition.getQueryWrapper(craftAbility, CraftAbilityEntity.class); // 名称 qw.like(craftAbility.containsKey("caName"), "CA_NAME", Func.toStr(craftAbility.get("caName"))); - qw.eq(craftAbility.containsKey("caCode"), "CA_CODE", Func.toStr(craftAbility.get("caCode"))); + qw.like(craftAbility.containsKey("caCode"), "CA_CODE", Func.toStr(craftAbility.get("caCode"))); qw.eq(craftAbility.containsKey("wtId"), "WT_ID", Func.toInt(craftAbility.get("wtId"))); // qw.eq(craftAbility.containsKey("platingSmall"), "plating_small", Func.toStr(craftAbility.get("platingSmall"))); if(null != startTime && null != endTime){ @@ -250,7 +250,7 @@ public class CraftAbilityController extends BladeController { } for(Long id : ids){ CraftAbilityEntity one = craftAbilityService.getById(id); - one.setWtId(mergeOne.getWtId()); + one.setWxLimit(mergeOne.getWxLimit()); craftAbilityService.updateById(one); } @@ -278,7 +278,11 @@ public class CraftAbilityController extends BladeController { CraftAbilityEntity notice = BeanUtil.copy(noticeExcel, CraftAbilityEntity.class); if(noticeExcel.getWtName() != null && !"".equals(noticeExcel.getWtName())){ String category = DictCache.getKey("ProcessCapabilityType", noticeExcel.getWtName()); - notice.setWtId(Long.valueOf(category)); + notice.setWtId(category); + } + if(noticeExcel.getWxLimitName() != null && !"".equals(noticeExcel.getWxLimitName())){ + String category = DictCache.getKey("WxLimit", noticeExcel.getWxLimitName()); + notice.setWxLimit(category); } noticeList.add(notice); }); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java index cd22643b..d8a10150 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CraftAbilityExcel.java @@ -75,7 +75,7 @@ public class CraftAbilityExcel implements Serializable { * 设备分类 */ @ColumnWidth(20) - @ExcelProperty("能力类型") + @ExcelProperty("外协限制") // private Long wtId; private String wtName; /** @@ -93,8 +93,8 @@ public class CraftAbilityExcel implements Serializable { @ExcelProperty("局部镀订单面积") private BigDecimal localArea; - @ExcelProperty("外协限制") - private String wxLimit; + @ExcelProperty("能力类型") + private String wxLimitName; @ExcelProperty("厂内比例") private String inRate; @ExcelProperty("外协比例") diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java index 4b657f22..5eeeccd1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestTaskService2.java @@ -21,6 +21,7 @@ import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.util.RoleUtil; import org.springblade.desk.common.feign.IMesNotifyMessageClient; import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity; +import org.springblade.desk.common.service.IMesNotifyMessageService; import org.springblade.desk.quality.constant.CycleTestConst; import org.springblade.desk.quality.constant.CycleTestTaskConst; import org.springblade.desk.quality.constant.InspectionTaskConst; @@ -97,6 +98,8 @@ public class CycleTestTaskService2 { private RoleConfig roleConfig; @Resource private IMesNotifyMessageClient mesNotifyMessageClient; + @Resource + private IMesNotifyMessageService mesNotifyMessageService; /** * list @@ -568,7 +571,7 @@ public class CycleTestTaskService2 { MesNotifyMessageEntity mesNotifyMessageEntity = new MesNotifyMessageEntity(); mesNotifyMessageEntity.setContent("您有实验任务临期"); mesNotifyMessageEntity.setReceiveUserId(task.getProcessUserId()); - mesNotifyMessageClient.save(mesNotifyMessageEntity); + mesNotifyMessageService.save(mesNotifyMessageEntity); } // 设置临期天数 task.setDayToPlanedFinish(getCountDayToOut(task.getId())); @@ -604,7 +607,7 @@ public class CycleTestTaskService2 { MesNotifyMessageEntity mesNotifyMessageEntity = new MesNotifyMessageEntity(); mesNotifyMessageEntity.setContent("您有实验任务超期"); mesNotifyMessageEntity.setReceiveUserId(task.getProcessUserId()); - mesNotifyMessageClient.save(mesNotifyMessageEntity); + mesNotifyMessageService.save(mesNotifyMessageEntity); // 更新状态 service.updateById(task);