From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
index 22e9289..d59ac1d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsProcessRouteServiceImpl.java
@@ -1,16 +1,17 @@
 package com.aps.core.service.impl;
 
-import java.util.List;
 import com.aps.common.core.utils.DateUtils;
 import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.core.domain.ApsProcessRoute;
 import com.aps.core.domain.ApsProcessRouteTemp;
+import com.aps.core.mapper.ApsProcessRouteMapper;
 import com.aps.core.mapper.ApsProcessRouteTempMapper;
+import com.aps.core.service.IApsProcessRouteService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.aps.core.mapper.ApsProcessRouteMapper;
-import com.aps.core.domain.ApsProcessRoute;
-import com.aps.core.service.IApsProcessRouteService;
+
+import java.util.List;
 
 /**
  * 宸ヨ壓璺嚎Service涓氬姟灞傚鐞�
@@ -112,11 +113,25 @@
             ids[i]= apsProcessRouteTemps.get(i).getId();
             ApsProcessRoute apsProcessRoute =new ApsProcessRoute();
             BeanUtils.copyProperties(apsProcessRouteTemps.get(i), apsProcessRoute);
-            apsProcessRoute.setId(IdUtils.fastUUID());
-            //鎻掑叆姝e紡琛紝骞惰褰�
-            apsProcessRoute.setCreateTime(DateUtils.getNowDate());
-            apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
-            apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
+            ApsProcessRoute apsProcessRoutetmp =new ApsProcessRoute();
+            apsProcessRoutetmp.setWorkOrderNo(apsProcessRoute.getWorkOrderNo());
+            apsProcessRoutetmp.setProcessNumber(apsProcessRoute.getProcessNumber());
+            List<ApsProcessRoute> apsProcessRoutes =apsProcessRouteMapper.selectApsProcessRouteList(apsProcessRoutetmp);
+            if(apsProcessRoutes.size()>0){
+                apsProcessRoute.setId(apsProcessRoutes.get(0).getId());
+                //鎻掑叆姝e紡琛紝骞惰褰�
+                apsProcessRoute.setCreateTime(DateUtils.getNowDate());
+                apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
+                apsProcessRouteMapper.updateApsProcessRoute(apsProcessRoute);
+            }else {
+                apsProcessRoute.setId(IdUtils.fastUUID());
+                //鎻掑叆姝e紡琛紝骞惰褰�
+                apsProcessRoute.setCreateTime(DateUtils.getNowDate());
+                apsProcessRoute.setIntegrationDay(DateUtils.getNowDate());
+                apsProcessRouteMapper.insertApsProcessRoute(apsProcessRoute);
+            }
+
+
             count++;
         }
         //鎻掑叆鏁伴噺涓庝复鏃惰〃鏌ヨ涓�鐩村垯鍒犻櫎涓存椂琛ㄦ暟鎹�
@@ -125,4 +140,9 @@
         }
         return 1;
     }
+
+    @Override
+    public List<ApsProcessRoute> selectProcessNameList(String orgCode) {
+        return apsProcessRouteMapper.selectProcessNameList(orgCode);
+    }
 }

--
Gitblit v1.9.3