2024-10-17 新增返回ID,查询附件判断，修复采购开票bug

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG003A.xml

@@ -328,7 +328,7 @@
 		CANCEL_AMOUNT = #cancelAmount#,
 		UN_CANCEL_AMOUNT = #unCancelAmount#,
 		<include refid="updateRevise"/>
-		WHERE RECEIVE_NO = #receiveNo#
+		WHERE ID = #id#
 	</update>
 
 	<!-- 行锁 -->

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java

@@ -413,14 +413,15 @@ public class ServiceHGCW012 extends ServiceBase {
                     //生成明细表
                     for (HGCW013 hgcw013 : hgcw013List) {
                         hgcw013.setMainId(hgcw012.getId());
-                        hgcw013.setId(null);
                         //跟新采购收票状态
                         Map<String, Object> paramMap = new HashMap<>();
                         paramMap.put(HGCG003B.FIELD_RECEIVE_NO, hgcw013.getSettlementNumber());
                         paramMap.put(HGCG003B.FIELD_IS_INVOICING, HGConstant.CgIsInvoicing.S_1);
                         paramMap.put(HGCG003B.FIELD_CANCEL_AMOUNT, hgcw013.getTotalContractPriceIncluding());
                         paramMap.put(HGCG003B.FIELD_UN_CANCEL_AMOUNT, 0);
+                        paramMap.put(HGCG003B.FIELD_ID, hgcw013.getId());
                         DaoUtils.update(HGSqlConstant.HgCg003A.UPDATE_IS_INVOICING, paramMap);
+                        hgcw013.setId(null);
                         this.addHGCW013(hgcw013);
                     }
                 } else {

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ002A.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.pz.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.ds.domain.HGDS002;
 import com.baosight.hggp.hg.pz.domain.HGPZ002A;
@@ -67,7 +68,7 @@ public class ServiceHGPZ002A extends ServiceEPBase {
 		try {
 			// 项目环境
 			String projectEnv = ProjectInfo.getProjectEnv();
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGPZ002A.queryRun", new HGPZ002A());
 			} else {
 				inInfo = super.query(inInfo, "HGPZ002A.queryDev", new HGPZ002A());

src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ009A.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.pz.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.utils.Iplat4jUtils;
 import com.baosight.hggp.hg.ds.domain.HGDS002;
@@ -57,7 +58,7 @@ public class ServiceHGPZ009A extends ServiceEPBase {
         try {
             // 项目环境
             String projectEnv = ProjectInfo.getProjectEnv();
-            if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+            if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
                 inInfo = super.query(inInfo, HGPZ009A.QUERY_RUN, new HGPZ009A());
             } else {
                 inInfo = super.query(inInfo, HGPZ009A.QUERY_DEV, new HGPZ009A());

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC003B.java

 package com.baosight.hggp.hg.sc.service;
 
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.tools.Iplat4jTools;
 import com.baosight.hggp.hg.sc.domain.HGSC099;
@@ -58,7 +59,7 @@ public class ServiceHGSC003B extends ServiceEPBase {
 				}
 				inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "bizTypes",bizTypes);
 			}
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGSC099.queryRun", new HGSC099());
 			} else {
 				inInfo = super.query(inInfo, "HGSC099.queryDev", new HGSC099());

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004B.java

 package com.baosight.hggp.hg.sc.service;
 
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.tools.Iplat4jTools;
 import com.baosight.hggp.hg.sc.domain.HGSC099;
@@ -56,7 +57,7 @@ public class ServiceHGSC004B extends ServiceEPBase {
 				}
 				inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "bizTypes",bizTypes);
 			}
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGSC099.queryRun", new HGSC099());
 			} else {
 				inInfo = super.query(inInfo, "HGSC099.queryDev", new HGSC099());

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004D.java

 package com.baosight.hggp.hg.sc.service;
 
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.tools.Iplat4jTools;
 import com.baosight.hggp.hg.sc.domain.HGSC099;
 import com.baosight.hggp.util.LogUtils;
@@ -56,7 +57,7 @@ public class ServiceHGSC004D extends ServiceEPBase {
 				}
 				inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "bizTypes",bizTypes);
 			}
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGSC099.queryRun", new HGSC099());
 			} else {
 				inInfo = super.query(inInfo, "HGSC099.queryDev", new HGSC099());

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -6,6 +6,7 @@ import com.baosight.hggp.common.ComputeTypeEnum;
 import com.baosight.hggp.common.HandleStatusEnum;
 import com.baosight.hggp.common.ProductTypeEnum;
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
@@ -1792,7 +1793,7 @@ public class HGSCTools {
             queryMap.put(HGSC099.FIELD_biz_type, bizType);
             // 项目环境
             String projectEnv = ProjectInfo.getProjectEnv();
-            if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+            if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
                 return DaoBase.getInstance().query("HGSC099.queryRun", queryMap);
             } else {
                 return DaoBase.getInstance().query("HGSC099.queryDev", queryMap);
@@ -1806,7 +1807,7 @@ public class HGSCTools {
             queryMap.put("bizTypes", bizTypes);
             // 项目环境
             String projectEnv = ProjectInfo.getProjectEnv();
-            if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+            if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
                 return DaoBase.getInstance().query("HGSC099.queryRun", queryMap);
             } else {
                 return DaoBase.getInstance().query("HGSC099.queryDev", queryMap);

src/main/java/com/baosight/hggp/hg/xt/service/ServiceHGXT001A.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.xt.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.hg.xt.domain.HGXT099;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ProjectInfo;
@@ -47,7 +48,7 @@ public class ServiceHGXT001A extends ServiceEPBase {
 		try {
 			// 项目环境
 			String projectEnv = ProjectInfo.getProjectEnv();
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGXT099.queryRun", new HGXT099());
 			} else {
 				inInfo = super.query(inInfo, "HGXT099.queryDev", new HGXT099());

src/main/java/com/baosight/hggp/hg/xt/service/ServiceHGXT099.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.xt.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.ds.domain.HGDS002;
 import com.baosight.hggp.hg.xt.domain.HGXT099;
@@ -48,7 +49,7 @@ public class ServiceHGXT099 extends ServiceEPBase {
 		try {
 			// 项目环境
 			String projectEnv = ProjectInfo.getProjectEnv();
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGXT099.queryRun", new HGXT099());
 			} else {
 				inInfo = super.query(inInfo, "HGXT099.queryDev", new HGXT099());

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX005.java

@@ -17,6 +17,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -65,13 +66,17 @@ public class ServiceHGYX005 extends ServiceEPBase {
             List<HGYX005> resultRows = MapUtils.toDaoEPBases(inInfo.getBlock(EiConstant.resultBlock).getRows(), HGYX005.class);
             List<HGYX005A> detailRows = MapUtils.toDaoEPBases(inInfo, CommonConstant.Field.DETAIL, HGYX005A.class);
             // 写入数据
-            for (HGYX005 HGYX005 : resultRows) {
-                if (HGYX005.getId() == null || HGYX005.getId() == 0) {
-                    this.add(HGYX005, detailRows);
+            List<HGYX005> hpyx005List = new ArrayList<>();
+            for (HGYX005 hgyx005 : resultRows) {
+                if (hgyx005.getId() == null || hgyx005.getId() == 0) {
+                    this.add(hgyx005, detailRows);
                 } else {
-                    this.modify(HGYX005,detailRows);
+                    this.modify(hgyx005,detailRows);
                 }
+                hpyx005List.add(hgyx005);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(hpyx005List);
+            inInfo.getBlock(CommonConstant.Field.DETAIL).setRows(detailRows);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX006.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +62,7 @@ public class ServiceHGYX006 extends ServiceEPBase {
     public EiInfo save(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+            List<HGYX006> list = new ArrayList<>();
             // 写入数据
             for (Map resultRow : resultRows) {
                 HGYX006 hgyx006 = new HGYX006();
@@ -70,7 +72,9 @@ public class ServiceHGYX006 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx006);
                 }
+                list.add(hgyx006);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX007.java

@@ -16,6 +16,7 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -71,6 +72,7 @@ public class ServiceHGYX007 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultA").getRows();
             // 写入数据
+            List<HGYX007> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX007 hgyx007 = new HGYX007();
                 hgyx007.fromMap(resultRow);
@@ -79,7 +81,9 @@ public class ServiceHGYX007 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx007);
                 }
+                list.add(hgyx007);
             }
+            inInfo.getBlock("resultA").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX008.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,7 @@ public class ServiceHGYX008 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultB").getRows();
             // 写入数据
+            List<HGYX008> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX008 hgyx008 = new HGYX008();
                 hgyx008.fromMap(resultRow);
@@ -78,7 +80,9 @@ public class ServiceHGYX008 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx008);
                 }
+                list.add(hgyx008);
             }
+            inInfo.getBlock("resultB").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX009.java

@@ -14,6 +14,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -69,6 +70,7 @@ public class ServiceHGYX009 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultC").getRows();
             // 写入数据
+            List<HGYX009> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX009 hgyx009 = new HGYX009();
                 hgyx009.fromMap(resultRow);
@@ -77,7 +79,9 @@ public class ServiceHGYX009 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx009);
                 }
+                list.add(hgyx009);
             }
+            inInfo.getBlock("resultC").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX010.java

@@ -14,6 +14,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -69,6 +70,7 @@ public class ServiceHGYX010 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 写入数据
+            List<HGYX010> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX010 hgyx010 = new HGYX010();
                 hgyx010.fromMap(resultRow);
@@ -77,7 +79,9 @@ public class ServiceHGYX010 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx010);
                 }
+                list.add(hgyx010);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX011.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +62,7 @@ public class ServiceHGYX011 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 写入数据
+            List<HGYX011> hgyx011List = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX011 hgyx011 = new HGYX011();
                 hgyx011.fromMap(resultRow);
@@ -69,7 +71,9 @@ public class ServiceHGYX011 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx011);
                 }
+                hgyx011List.add(hgyx011);
             }
+            inInfo.getBlock(EiConstant.resultBlock).setRows(hgyx011List);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX012.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,7 @@ public class ServiceHGYX012 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultA").getRows();
             // 写入数据
+            List<HGYX012> hgyx012List = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX012 hgyx012 = new HGYX012();
                 hgyx012.fromMap(resultRow);
@@ -78,7 +80,9 @@ public class ServiceHGYX012 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx012);
                 }
+                hgyx012List.add(hgyx012);
             }
+            inInfo.getBlock("resultA").setRows(hgyx012List);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX013.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,7 @@ public class ServiceHGYX013 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultB").getRows();
             // 写入数据
+            List<HGYX013> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX013 hgyx013 = new HGYX013();
                 hgyx013.fromMap(resultRow);
@@ -78,7 +80,9 @@ public class ServiceHGYX013 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx013);
                 }
+                list.add(hgyx013);
             }
+            inInfo.getBlock("resultB").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX014.java

@@ -15,6 +15,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.resource.I18nMessages;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,7 @@ public class ServiceHGYX014 extends ServiceEPBase {
         try {
             List<Map> resultRows = inInfo.getBlock("resultC").getRows();
             // 写入数据
+            List<HGYX014> list = new ArrayList<>();
             for (Map resultRow : resultRows) {
                 HGYX014 hgyx014 = new HGYX014();
                 hgyx014.fromMap(resultRow);
@@ -78,7 +80,9 @@ public class ServiceHGYX014 extends ServiceEPBase {
                 } else {
                     this.modify(hgyx014);
                 }
+                list.add(hgyx014);
             }
+            inInfo.getBlock("resultC").setRows(list);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
         } catch (Exception e) {

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX006.xml

@@ -199,6 +199,9 @@
 										PRODUCT_INVENT  <!-- 产品库存 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #productCode#, #productName#, #productType#, #productPecu#, #productGood#, #productPrice#, #disWay#, #productInvent#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX006
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX007.xml

@@ -172,6 +172,9 @@
 										BUS_PART  <!-- 合作伙伴 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #channelCode#, #channelName#, #coverDist#, #tarMarket#, #busPart#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX007
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX008.xml

@@ -190,6 +190,9 @@
 										WORK_EXPE  <!-- 工作经历 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #name#, #position#, #degree#, #profes#, #skill#, #speciality#, #workExpe#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX008
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX009.xml

@@ -163,6 +163,9 @@
 										ACTUAL_EXPE  <!-- 实际支出 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #budget#, #sourceFunds#, #distSitua#, #actualExpe#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX009
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX010.xml

@@ -222,6 +222,9 @@
 										ACTUAL_TRAN  <!-- 实际转化率 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #sellDate#, #sourceFunds#, #district#, #content#, #promChannel#, #goalMarket#, #goalAmount#, #goalTran#, #budget#, #actualCode#, #actualTran#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX010
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX011.xml

@@ -199,6 +199,9 @@
 										SURVEY_USER  <!-- 调查人员 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #surveyDate#, #district#, #policyEnv#, #economyEnv#, #sociCultureEnv#, #supplier#, #competeUser#, #surveyUser#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX011
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX012.xml

@@ -190,6 +190,9 @@
 										SURVEY_USER  <!-- 调查人员 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #surveyDate#, #district#, #client#, #buyMotive#, #buyAmount#, #buyProducts#, #surveyUser#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX012
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX013.xml

@@ -190,6 +190,9 @@
 										SURVEY_USER  <!-- 调查人员 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #surveyDate#, #district#, #productName#, #quantity#, #price#, #quality#, #surveyUser#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX013
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX014.xml

@@ -190,6 +190,9 @@
 										SURVEY_USER  <!-- 调查人员 -->
 										)
 	    VALUES (#id#, #accountCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #surveyDate#, #district#, #productGoodBad#, #priceGoodBad#, #channelEffect#, #promoMethodGoodBad#, #surveyUser#)
+		<selectKey resultClass="long" keyProperty="id">
+			SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGYX014
+		</selectKey>
 	</insert>
 
 	<delete id="delete">

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL001A.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.zl.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.hg.zl.domain.HGZL001;
 import com.baosight.hggp.hg.zl.domain.HGZL001A;
@@ -57,7 +58,7 @@ public class ServiceHGZL001A extends ServiceEPBase {
 		try {
 			// 项目环境
 			String projectEnv = ProjectInfo.getProjectEnv();
-			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HGZL001A.queryRun", new HGZL001A());
 			} else {
 				inInfo = super.query(inInfo, "HGZL001A.queryDev", new HGZL001A());

src/main/webapp/HG/CW/HGCW012A.js

@@ -156,6 +156,11 @@ $(function () {
         "result": {
             columns: [
                 {
+                    field: "id",
+                    title: "ID",
+                    hidden: true
+                },
+                {
                     field: "companyName",
                     title: "公司名称",
                     headerTemplate: "<span style='color: '>公司名称 </span>",