From fc13af60a52d08aacddbd8f0d89c33da844a2464 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 29 Jul 2020 10:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ApplyArchiveServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java index 58c36072e..5dc820a8e 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java @@ -32,6 +32,7 @@ import com.base.util.MultipartDataUtil; import com.base.util.ReturnMapUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import apx.com.amarsoft.als.apzl.apply.contract.make.util.ContractMakeControllerUtil; import apx.com.amarsoft.als.user.change.center.service.ApplyArchiveService; import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO; import jbo.app.tenwa.doc.LB_FILE_MAILARCHIVING_INFO_TEMP; @@ -455,13 +456,20 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ Map testMap = (Map) MultipartDataUtil .readRequestParam(request, "UTF-8"); fieldMap = (Map) testMap.get("fieldMap"); - String SerialNo = fieldMap.get("serialno") == null ? "" : fieldMap.get("serialno").toString(); - String sql = "SELECT serialno,whether FROM PRD_SPECIFIC_LIBRARY WHERE SerialNo='"+SerialNo+"' "; + String flowUnid = fieldMap.get("FLOWUNID") == null ? "" : fieldMap.get("FLOWUNID").toString(); + String serialNo = fieldMap.get("serialNo") == null ? "" : fieldMap.get("serialNo").toString(); + Map flowParms = ContractMakeControllerUtil.getFlowParms(flowUnid); + if(flowParms == null){ + ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("fail").toString(), "没有查询到对应的流程实例！"); + return ReturnMapUtil.getReturnMap(); + } + + String sql = "SELECT serialno,whether FROM PRD_SPECIFIC_LIBRARY WHERE productid='"+flowParms.get("ProductId")+"' "; List> dataList = DataOperatorUtil.getDataBySql(sql); Map body = new HashMap(); if(dataList.size()>0){ for (Map map : dataList) { - body.put("serialno", map.get("serialno")+""); + body.put("serialno", serialNo); body.put("whether", map.get("whether")+""); } ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), "");