From 668a64ad6cf0c59a177e0543165ef7196812b773 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 28 Jun 2022 09:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdm/service/impl/WorkTaskServiceImpl.java | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
index 16f2f849..5cf2bf7c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkTaskServiceImpl.java
@@ -52,6 +52,14 @@ public class WorkTaskServiceImpl implements WorkTaskService {
         if (StrUtil.isNotEmpty(worktask_code)) {
             map.put("worktask_code", "%" + worktask_code + "%");
         }
+        String begin_time = map.get("begin_time");
+        if (StrUtil.isNotEmpty(begin_time)) {
+            map.put("begin_time", begin_time.substring(0,10)+" 00:00:00");
+        }
+        String end_time = map.get("end_time");
+        if (StrUtil.isNotEmpty(end_time)) {
+            map.put("end_time", end_time.substring(0,10)+" 23:59:59");
+        }
         JSONObject json = WQL.getWO("QPDM_WORKTASK01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "WorkTask.worktask_code");
         return json;
     }
@@ -311,14 +319,14 @@ public class WorkTaskServiceImpl implements WorkTaskService {
                 JSONArray Formulas = PDM_BI_Formula.query("is_delete='0' and status<>'99' and workorder_id ='" + jsonMst.getString("workorder_id") + "' and material_id='"+jsonMst.getString("material_id")+"'").getResultJSONArray(0);
                 for(int j=0;j<Formulas.size();j++){
 
-                        JSONObject Formulas_jo = Formulas.getJSONObject(j);
-                        Formulas_jo.put("status","99");
-                        Formulas_jo.put("finish_type", "02");
-                        Formulas_jo.put("end_id", currentUserId + "");
-                        Formulas_jo.put("end_name", nickName);
-                        Formulas_jo.put("end_time", now);
-                        Formulas_jo.put("confirm_type", "00");
-                        PDM_BI_Formula.update(Formulas_jo);
+                    JSONObject Formulas_jo = Formulas.getJSONObject(j);
+                    Formulas_jo.put("status","99");
+                    Formulas_jo.put("finish_type", "02");
+                    Formulas_jo.put("end_id", currentUserId + "");
+                    Formulas_jo.put("end_name", nickName);
+                    Formulas_jo.put("end_time", now);
+                    Formulas_jo.put("confirm_type", "00");
+                    PDM_BI_Formula.update(Formulas_jo);
 
                     JSONArray FormulaDtls = PDM_BI_FormulaDtl.query("status<>'99' and formula_id='"+Formulas_jo.getString("formula_id")+"'").getResultJSONArray(0);
                     for(int m=0;m<FormulaDtls.size();m++){