登记表生成代码优化

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -764,6 +764,10 @@ public class CommonController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "pdf流生成", notes = "pdf流生成")
     @PostMapping(value = "/getRegistrationFormStream")
     public void getRegistrationFormStream(@RequestBody JSONObject map,HttpServletResponse response) {
-        commonService.getRegistrationFormStream(map,response);
+        JSONObject formData = JSONObject.parseObject(JSONObject.toJSONString(map.get("formData")));
+        String manageType = String.valueOf(map.get("manageType"));
+        ReginParams selectedOrgInfo = getSelectedOrgInfo();
+        formData.put("userName",selectedOrgInfo.getUserModel().getRealName());
+        commonService.getRegistrationFormStream(formData,manageType,response);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -255,5 +255,5 @@ public interface ICommonService {
 
     Map<String, Object> getRegistrationFormUrl(String manageType, JSONObject formData);
 
-    void getRegistrationFormStream(JSONObject map,HttpServletResponse response);
+    void getRegistrationFormStream(JSONObject formData,String manageType,HttpServletResponse response);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-form-set.ftl

@@ -93,7 +93,7 @@
                                 <w:sz w:val="21"/>
                                 <w:szCs w:val="21"/>
                             </w:rPr>
-                            <w:t>${(registrationType)!''}</w:t>
+                            <w:t>${(registrationType)!'新设备首次启用'}</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="43379CD5">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/use-registration-form-vehicle.ftl

@@ -574,7 +574,7 @@
                         <w:sz w:val="21"/>
                         <w:sz-cs w:val="21"/>
                     </w:rPr>
-                    <w:t>${(registrationType)!''}</w:t>
+                    <w:t>${(registrationType)!'新设备首次启用'}</w:t>
                 </w:r>
             </w:p>
             <w:tbl>