pdf文档按照公式生成具体金额和人数

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/AttachmentController.java

@@ -17,6 +17,7 @@ import com.jpsoft.picc.modules.common.config.PdfConfig;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.utils.ItextPDFUtil;
 import com.jpsoft.picc.modules.common.utils.OSSUtil;
+import com.jpsoft.picc.modules.common.utils.VelocityHelper;
 import com.jpsoft.picc.modules.common.utils.Watermark;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -31,14 +32,16 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.OutputStream;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -133,14 +136,32 @@ public class AttachmentController {
 
             List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
 
-            for (InsuranceDefinitionLimit insuranceDefinitionLimit : insuranceDefinitionLimitList) {
+            Map<String,Object> varsMap = new HashMap<>();
+            varsMap.put("num",insuranceApplication.getInsuredNumber());
+
+            for(InsuranceDefinitionLimit  insuranceDefinitionLimit:insuranceDefinitionLimitList){
+                Map<String,Object> map1 = new HashMap<>();
+                map1.put("id",insuranceDefinitionLimit.getId());
+                map1.put("name",insuranceDefinitionLimit.getName());
+
+                //限额这里可能是公式，需要带入人数
+                String limit = VelocityHelper.format(insuranceDefinitionLimit.getLimit(),varsMap);
+                map1.put("limit",limit);
+
+                String unit = VelocityHelper.format(insuranceDefinitionLimit.getUnit(),varsMap);
+                map1.put("unit",unit);
+
+                mapList.add(map1);
+            }
+
+            /*for (InsuranceDefinitionLimit insuranceDefinitionLimit : insuranceDefinitionLimitList) {
                 Map<String, Object> map1 = new HashMap<String, Object>();
                 map1.put("id", insuranceDefinitionLimit.getId());
                 map1.put("name", insuranceDefinitionLimit.getName());
                 map1.put("limit", insuranceDefinitionLimit.getLimit());
                 map1.put("unit", insuranceDefinitionLimit.getUnit());
                 mapList.add(map1);
-            }
+            }*/
 
             List<InsurancePolicyMember> list = insurancePolicyMemberService.findByPolicyId(policyId);