Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -755,6 +755,8 @@ public class CommonController extends BaseController {
     public ResponseModel<Map<String,Object>> getRegistrationFormUrl(@RequestBody JSONObject map) {
         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());
         return ResponseHelper.buildResponse(commonService.getRegistrationFormUrl(manageType, formData));
     }
 

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

@@ -2218,14 +2218,13 @@ public class CommonServiceImpl implements ICommonService {
         String fileName ;
         if (UNIT.equals(manageType)){
             wordPath = "use-registration-form-unit.ftl";
-            fileName = "use-registration-form-unit.ftl";
+            fileName = "台套使用登记表_";
         }else if (SET.equals(manageType)){
             wordPath = "use-registration-form-set.ftl";
-            fileName = "use-registration-form-set.ftl";
+            fileName = "单位使用登记表_";
         }else {
             wordPath = "use-registration-form-vehicle.ftl";
-            fileName = "use-registration-form-vehicle.ftl";
-            formData.put("equipBasicInfoList",formData.get("equipmentLists"));
+            fileName = "车用气瓶使用登记表_";
         }
         // word转pdf
         File pdfFile = null;