fix：[试验管理]表单优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java

@@ -670,7 +670,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             throw new ServiceException("学科不存在或已删除");
         }
         // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号
-        return "MB" + template.getShowSn() + study.getSn() + dep.getAbbr() + snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+        return "MB-" + template.getShowSn() +"-"+ study.getSn() +"-"+ dep.getAbbr() +"-"+ snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
     }
 
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -734,7 +734,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             throw new ServiceException("学科不存在或已删除");
         }
         // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号+流水号
-        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue())+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+        return "MB-"+template.getShowSn()+"-"+study.getSn()+"-"+dep.getAbbr()+"-"+snGenService.getNewSn(SnTypeEnum.tbbd.getValue())+"-"+snGenService.getNewSn(SnTypeEnum.tbbd.getValue());
     }
 
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java

@@ -479,7 +479,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
             throw new ServiceException("学科不存在或已删除");
         }
         // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号
-        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+        return "MB-"+template.getShowSn()+"-"+study.getSn()+"-"+dep.getAbbr()+"-"+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
     }
 
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

@@ -598,7 +598,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             throw new ServiceException("学科不存在或已删除");
         }
         // MB+表单名缩写(底层模板名称)+版本号+试验编号+学科缩写+流水号
-        return "MB"+template.getShowSn()+study.getSn()+dep.getAbbr()+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
+        return "MB-"+template.getShowSn()+"-"+study.getSn()+"-"+dep.getAbbr()+"-"+snGenService.getNewSn(SnTypeEnum.ybbd.getValue());
     }
 
     /**