fix(JG)：标志套打模版修改

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/JgUseRegistrationServiceImpl.java

@@ -1436,7 +1436,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useFlagParamDto.setEquListCode(registerInfo.getEquList());
         useFlagParamDto.setEquipCode(registerInfo.getEquCode());
         useFlagParamDto.setEquipCategory(exportParamsMap.get("equCategory").toString());
-        useFlagParamDto.setEquipDefine(exportParamsMap.get("equDefine") == null ? "" : exportParamsMap.get("equDefine").toString());
+        useFlagParamDto.setEquipDefine(Optional.ofNullable(exportParamsMap.get("equDefine"))
+                        .orElse(exportParamsMap.get("equCategory").toString())
+                        .toString());
         useFlagParamDto.setUseUnitName(exportParamsMap.get("useUnitName").toString());
         useFlagParamDto.setUseInnerCode(exportParamsMap.get("useInnerCode").toString());
         useFlagParamDto.setReceiveOrgName(useRegistration.getReceiveOrgName());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/flag1-use-equip.ftl

@@ -854,7 +854,7 @@
 															<w:sz w:val="18"/>
 															<w:sz-cs w:val="18"/>
 														</w:rPr>
-														<w:t>${(equipDefine!equipCategory)}</w:t>
+														<w:t>${(equipDefine)}</w:t>
 													</w:r>
 												</w:p>
 											</w:txbxContent>