条带计算id修改

orbit-base-biz/base-biz-api/src/main/java/com/base/api/model/TargetDemandRpcDTO.java

@@ -40,4 +40,16 @@ public class TargetDemandRpcDTO {
     private String parentId;
     @ApiModelProperty
     List<PointRpcDTO> pointDTOList;
+
+    @ApiModelProperty("需求来源")
+    private String demandSources;
+
+    @ApiModelProperty("提出部门")
+    private String proposeDepartment;
+
+    @ApiModelProperty("需求来源描述")
+    private String demandDescribe;
+
+    @ApiModelProperty("是否精确 0-是 1-否")
+    private String isaccurate;
 }

orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/entity/TargetDemand.java

@@ -203,4 +203,16 @@ public class TargetDemand {
     @ApiModelProperty("需求状态，0：未提交，1：已提交")
     private Integer status;
 
+    @ApiModelProperty("需求来源")
+    private String demandSources;
+
+    @ApiModelProperty("提出部门")
+    private String proposeDepartment;
+
+    @ApiModelProperty("需求来源描述")
+    private String demandDescribe;
+
+    @ApiModelProperty("是否精确 0-是 1-否")
+    private String isaccurate;
+
 }

orbit-base-plan/base-plan-service/src/main/java/com/base/plan/service/StripService.java

@@ -908,7 +908,7 @@ public class StripService extends ServiceImpl<StripMapper, StripInfo> {
                     List<EphTrack> ephdatas = new ArrayList<>();
                     BizReq bizReq = new BizReq();
                     StripCalcResult stripCalcResult = new StripCalcResult();
-                    String stripCalcResultId = UUID.randomUUID().toString().replace("-", "") + primaryKeyGenerator.getAndIncrement();
+                    String stripCalcResultId = String.valueOf(IdGenerator.getId())+ primaryKeyGenerator.getAndIncrement();
                     stripCalcResult.setStripCalcResultId(stripCalcResultId);
                     stripCalcResult.setTargetCode(targetRelationDTO.getTargetCode());
                     stripCalcResult.setTargetName(targetRelationDTO.getTargetName());