From 74ff3c897623c622a1e26424fcd1b995bd90f01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?=
 <sdlizheng@yonyou.com>
Date: Mon, 19 May 2025 15:29:59 +0800
Subject: [PATCH] =?UTF-8?q?mmpac=5F=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8Aope?=
 =?UTF-8?q?napi=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nccloud/openapi/mmpac/wr/WrResource.java  | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java b/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
index a460f9d..e05334f 100644
--- a/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
+++ b/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
@@ -74,8 +74,8 @@ public class WrResource extends AbstractNCCRestResource {
 
     @POST
     @Path("saveAndApprove")
-    @Consumes({ "application/json" })
-    @Produces({ "application/json" })
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
     public JSONString saveAndApprove(List<Map<String, Object>> paramList) {
         if (MMValueCheck.isEmpty(paramList)) {
             return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", "1");
@@ -261,8 +261,8 @@ public class WrResource extends AbstractNCCRestResource {
 
     @POST
     @Path("deleteByMesIDs")
-    @Consumes({ "application/json" })
-    @Produces({ "application/json" })
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
     public JSONString deleteByMesIDs(String[] mesIDs) {
         if (MMValueCheck.isEmpty(mesIDs)) {
             return ResultMessageUtil.exceptionToJSON("传入数据异常", "1");
@@ -279,14 +279,15 @@ public class WrResource extends AbstractNCCRestResource {
 
     @POST
     @Path("newsave")
-    @Consumes({ "application/json" })
-    @Produces({ "application/json" })
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
     public JSONString newsave(Map<String, Object> paramsMap) {
         List<Map<String, Object>> paramList = (List<Map<String, Object>>) paramsMap.get("data");
         if (MMValueCheck.isEmpty(paramList)) {
             return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", "1");
         }
         List<AggWrVO> voList = new ArrayList<AggWrVO>();
+        BaseDAO baseDAO = new BaseDAO();
         try {
             for (Map<String, Object> paramMap : paramList) {
                 if (!paramMap.containsKey(HEADTABLE) || !paramMap.containsKey(BODYTABLE)) {
@@ -347,12 +348,16 @@ public class WrResource extends AbstractNCCRestResource {
                 vo.setChildren(WrItemVO.class, items.toArray(new WrItemVO[0]));
                 voList.add(vo);
                 IAPIWrMaintain server = NCLocator.getInstance().lookup(IAPIWrMaintain.class);
-//                List<AggWrVO> aggWrVOS = TransferCodeToPKTool.transferAggVO(voList);
-//                //翻译报告类型
-//                List<BilltypeVO> collection = (List<BilltypeVO>) new BaseDAO().retrieveByClause(BilltypeVO.class, " pk_billtypecode='" + aggWrVOS.get(0).getParentVO().getVtrantypecode()+"'");
-//                aggWrVOS.get(0).getParentVO().setVtrantypeid(collection.get(0).getPk_billtypeid());
-//                aggWrVOS.get(0).getParentVO().setDbilldate(new UFDate());
-//                AggWrVO[] aggvos = server.newsave(aggWrVOS.toArray(new AggWrVO[0]));
+                List<AggWrVO> aggWrVOS = TransferCodeToPKTool.transferAggVO(voList);
+                //翻译报告类型
+                for (AggWrVO aggWrVO : aggWrVOS) {
+                    List<BilltypeVO> collection = (List<BilltypeVO>) baseDAO.retrieveByClause(BilltypeVO.class, " pk_billtypecode='" + aggWrVO.getParentVO().getVtrantypecode() + "'");
+                    if(collection==null||collection.size()==0){
+                        throw new BusinessException("翻译报告类型失败，检查报告类型编码【"+aggWrVO.getParentVO().getVtrantypecode()+"】");
+                    }
+                    aggWrVO.getParentVO().setVtrantypeid(collection.get(0).getPk_billtypeid());
+                    aggWrVO.getParentVO().setDbilldate(new UFDate());
+                }
                 AggWrVO[] aggvos = server.newsave(voList.toArray(new AggWrVO[0]));
                 boolean successFlag = true;
                 StringBuilder errMsg = new StringBuilder();
@@ -384,8 +389,8 @@ public class WrResource extends AbstractNCCRestResource {
 
     @POST
     @Path("update")
-    @Consumes({ "application/json" })
-    @Produces({ "application/json" })
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
     public JSONString update(Map<String, Object> paramsMap) throws BusinessException {
         List<Map<String, Object>> paramList = (List<Map<String, Object>>) paramsMap.get("data");
         if (MMValueCheck.isEmpty(paramList)) {
@@ -532,8 +537,8 @@ public class WrResource extends AbstractNCCRestResource {
 
     @POST
     @Path("delete")
-    @Consumes({ "application/json" })
-    @Produces({ "application/json" })
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
     public JSONString delete(Map<String, Object> paramMap) throws BusinessException {
         if (MMValueCheck.isEmpty(paramMap)) {
             return ResultMessageUtil.exceptionToJSON("传入数据异常", "1");