From 569a3132c145cb49b1a6efc499c8ba153ebd21a7 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Thu, 15 Dec 2022 15:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E3=80=81=E4=BA=BA=E5=91=98=E5=B0=81=E5=AD=98=E5=90=8E=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=9E=B6=E6=9E=84=E5=9B=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VersionManageServiceImpl.java        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
index 576d32ad..4046df73 100644
--- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
+++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
@@ -80,10 +80,12 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,null);
                 List versions = new ArrayList<>();
                 Map<String,String> map = new HashMap<>();
-                for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
-                    map.put("value", String.valueOf(hrmSubCompanyVersion.getVersion()));
-                    versions.add(map);
+                for (int i=0;i<list.size();i++){
+                    HrmSubCompanyVersion hrmSubCompanyVersion = list.get(i);
+                    String value = "value" + i;
+                    map.put(value,  String.format("%.1f", hrmSubCompanyVersion.getVersion()));
                 }
+                versions.add(map);
                 List<HrmSubCompanyVersion> list2 = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,id);
 //                List datas = new ArrayList<>();
 //                Map<String,String> map2 = new HashMap<>();
@@ -143,8 +145,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
 
         getJclOrgMapMapper().deleteMap("1", id, jclOrgMap.getFDateBegin());
         getJclOrgMapMapper().updateMap("1", id, jclOrgMap.getFDateBegin(), time);
-
-        getJclOrgMapMapper().insertMap(jclOrgMap);
+        if(!params.getString("canceled").equals("1")){
+            getJclOrgMapMapper().insertMap(jclOrgMap);
+        }
     }
 
     /**
@@ -198,7 +201,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
 
         getJclOrgMapMapper().deleteMap("2", id, jclOrgMap.getFDateBegin());
         getJclOrgMapMapper().updateMap("2", id, jclOrgMap.getFDateBegin(), time);
-        getJclOrgMapMapper().insertMap(jclOrgMap);
+        if(!params.getString("canceled").equals("1")){
+            getJclOrgMapMapper().insertMap(jclOrgMap);
+        }
     }
 
 
@@ -243,7 +248,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
         getJclOrgMapMapper().deleteMap("4", id, jclOrgMap.getFDateBegin());
         getJclOrgMapMapper().updateMap("4", id, jclOrgMap.getFDateBegin(), time);
 
-        getJclOrgMapMapper().insertMap(jclOrgMap);
+        if(!params.getString("canceled").equals("1")){
+            getJclOrgMapMapper().insertMap(jclOrgMap);
+        }
 
     }