试验编号优化

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialNumberRuleController.java

@@ -197,9 +197,9 @@ public class TrialNumberRuleController extends BladeController {
     @GetMapping("/getTrialNumber")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "获取试验编号", notes = "传入projectId,contractId,type,nodeId")
-    public R<String> getTrialNumber(Long projectId,Long contractId, Integer type, Long nodeId){
+    public R<Map<String, String>> getTrialNumber(Long projectId,Long contractId, Integer type, Long nodeId){
         Map<String, String> map = trialNumberRuleService.getTrialNumber(projectId,contractId, type, nodeId, true);
-        return  R.data(map.get("trialNumber"));
+        return  R.data(map);
     }
     @GetMapping("/getEntrustNumber")
     @ApiOperationSupport(order = 11)

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialNumberRuleServiceImpl.java

@@ -174,6 +174,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                     trialNumber.append(autoIncrementNumber);
                 }
                 else {
+                    map.put("autoIncrementNumber","");
                     trialNumber.append(rule.getData());
                 }
             }