From 77c759fabf9d073aafd6f4c7f18196ab6bf2fad3 Mon Sep 17 00:00:00 2001
From: Allenxy <13762749+chaosallen@user.noreply.gitee.com>
Date: Sun, 13 Oct 2024 14:03:05 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E8=AE=BE=E5=AE=9A=E5=80=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fizz/business/domain/ModSetupResult.java  |  2 +-
 .../fizz/business/form/CrmPdoExcoilForm.java  |  6 ++----
 .../business/form/ModSetupResultForm.java     |  2 +-
 .../service/impl/CrmPdoExcoilServiceImpl.java |  4 ++--
 .../impl/ModSetupResultServiceImpl.java       | 19 ++++++++++++-------
 .../fizz/business/vo/ModSetupResultVO.java    |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
index 30ee617..d84643d 100644
--- a/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
+++ b/business/src/main/java/com/fizz/business/domain/ModSetupResult.java
@@ -26,7 +26,7 @@ public class ModSetupResult {
     private String coilId;
 
     @ApiModelProperty(value = "道次号")
-    private Integer passId;
+    private Integer passno;
 
     @ApiModelProperty(value = "机架号")
     private Integer standId;
diff --git a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
index 242211c..c86ff32 100644
--- a/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
+++ b/business/src/main/java/com/fizz/business/form/CrmPdoExcoilForm.java
@@ -14,12 +14,10 @@ public class CrmPdoExcoilForm {
     @ApiModelProperty(value = "钢卷号")
     private String encoilid;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "开始日期")
-    private LocalDateTime startDate;
+    private String startDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "结束日期")
-    private LocalDateTime endDate;
+    private String endDate;
 
 }
diff --git a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
index b90ade0..2ec56c8 100644
--- a/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
+++ b/business/src/main/java/com/fizz/business/form/ModSetupResultForm.java
@@ -13,7 +13,7 @@ public class ModSetupResultForm {
     private String grade;
 
     @ApiModelProperty(value = "道次号")
-    private Integer passId;
+    private Integer passno;
 
     @ApiModelProperty(value = "退火厚度")
     private Integer annealThick;
diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
index a05072a..eee3fbb 100644
--- a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
@@ -67,8 +67,8 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
             queryWrapper.eq("exit_coilid", form.getEncoilid()).eq("encoilid",  form.getEncoilid());
         }
 
-        queryWrapper.ge("start_date", form.getStartDate() + "00:00:00");
-        queryWrapper.le("start_date", form.getStartDate() + "23:59:59");
+        queryWrapper.ge("start_date", form.getStartDate() + " 00:00:00");
+        queryWrapper.le("start_date", form.getStartDate() + " 23:59:59");
 
         return baseMapper.selectList(queryWrapper);
     }
diff --git a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java
index d692615..265349f 100644
--- a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java
@@ -21,23 +21,28 @@ public class ModSetupResultServiceImpl extends ServiceImpl<ModSetupResultMapper,
 
         // 确保各个字段的非空验证
         if (StringUtils.isEmpty(form.getGrade()) || form.getAnnealThick() == null ||
-                form.getEntryThick() == null || form.getExitThick() == null || form.getPassId() == null) {
+                form.getEntryThick() == null || form.getExitThick() == null || form.getPassno() == null) {
             throw new IllegalArgumentException("必要的字段缺失");
         }
 
         // 去除Double类型的字段的小数位
-        int annealThick = form.getAnnealThick();
-        int entryThick = form.getEntryThick().intValue();  // 去除小数位
-        int exitThick = form.getExitThick().intValue();    // 去除小数位
-        int passId = form.getPassId();
+        // 获取厚度并处理
+        int annealThick = Math.round(form.getAnnealThick() * 100);  // 乘以100并四舍五入
+        int entryThick = (int) Math.round(form.getEntryThick() * 100);    // 乘以100并四舍五入
+        int exitThick = (int) Math.round(form.getExitThick() * 100);      // 乘以100并四舍五入
+
+        // 格式化为三位数字
+        String annealThickStr = String.format("%03d", annealThick);
+        String entryThickStr = String.format("%03d", entryThick);
+        String exitThickStr = String.format("%03d", exitThick);
 
         // 根据字段构建 calcId
-        String calcId = form.getGrade() + annealThick + entryThick + exitThick + passId;
+        String calcId = form.getGrade() + annealThickStr + entryThickStr + exitThickStr + form.getPassno();
 
         // 实际查询代码（根据 calcId 查询数据）
         // 这里假设查询方法为根据 calcId 查找结果
         LambdaQueryWrapper<ModSetupResult> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ModSetupResult::getCalcId,calcId);
+        queryWrapper.eq(ModSetupResult::getCalcId, calcId);
 
         List<ModSetupResult> results = this.baseMapper.selectList(queryWrapper);
 
diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
index 1a97705..d93876c 100644
--- a/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
+++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultVO.java
@@ -23,7 +23,7 @@ public class ModSetupResultVO {
     private String coilId;
 
     @ApiModelProperty(value = "道次号")
-    private Integer passId;
+    private Integer passno;
 
     @ApiModelProperty(value = "入口厚度")
     private Float entryThick;