需求修改test

src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java

@@ -7,8 +7,6 @@ import com.pms.ocp.model.entity.Model;
 import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
 import com.pms.ocp.model.vo.ModelVersionRequirementVO;
 
-import java.util.List;
-
 /**
  * @Auther: wangjian
  * @Date: 2022/4/1 10:29

src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java

@@ -50,15 +50,18 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
     @Override
     public Integer createModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO) {
 
+        modelVersionRequirementDTO.setRequirementCode("MR-" + ((Math.random() * 9 + 1) * 100000));
+
         // 需求信息创建
         ModelRequirement modelRequirement = new ModelRequirement();
         BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement);
         modelRequirement.setCtime(LocalDateTime.now());
+        modelRequirement.setRequirementCode(modelVersionRequirementDTO.getRequirementCode());
 
         // 需求审批信息创建
         ModelRequirementApproval modelRequirementApproval = new ModelRequirementApproval();
         modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode());
-        modelRequirementApproval.setApprovalStats(0);
+        modelRequirementApproval.setApprovalStatus(0);
 
         // 表版本信息创建
         ModelBaseVersion modelBaseVersion = new ModelBaseVersion();

src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java

@@ -59,9 +59,9 @@ public class ModelVersionRequirementDTO {
     private String equipType;
 
     /**
-     * 所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合
+     * 所属专业 ts:输电, t:变电, dc:直流, ds配电, tc:技术, pl:计划, im:综合
      */
-    @ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合")
+    @ApiModelProperty(value = "所属专业 ts:输电, t:变电, dc:直流, ds配电, tc:技术, pl:计划, im:综合")
     private String professionalKind;
 
     /**
@@ -199,7 +199,7 @@ public class ModelVersionRequirementDTO {
      * 推广类型 0:统推, 1：自建
      */
     @ApiModelProperty(value = "推广类型 0:统推, 1：自建")
-    private Integer propPromotion;
+    private Integer modelPromotion;
 
 }
 

src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java

@@ -34,7 +34,7 @@ public class ModelRequirementApproval {
     /**
      * 审批状态 0:未审核 1：审核通过 2：审核拒绝
      */
-    private Integer approvalStats;
+    private Integer approvalStatus;
 
     /**
      * 审核人单位

src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java

@@ -21,7 +21,6 @@ import java.time.LocalDateTime;
 @Data
 public class ModelPropertyVersionRequirementVO {
 
-
     /**
      * 主键
      */
@@ -125,6 +124,12 @@ public class ModelPropertyVersionRequirementVO {
     @ApiModelProperty(value = "修改时间")
     private LocalDateTime propMtime;
 
+    /**
+     * 属性推广类型 0:统推, 1：自建
+     */
+    @ApiModelProperty(value = "属性推广类型 0:统推, 1：自建")
+    private Integer porpPromotion;
+
     /**
      * 需求编码
      */

src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java

@@ -140,6 +140,12 @@ public class ModelVersionRequirementVO {
     @ApiModelProperty(value = "版本简述")
     private String modelVersionDesc;
 
+    /**
+     * 模型推广类型 0:统推, 1：自建
+     */
+    @ApiModelProperty(value = "模型推广类型 0:统推, 1：自建")
+    private Integer modelPromotion;
+
     /**
      * 是否已经删除 0未删除  1已删除
      */
@@ -194,7 +200,7 @@ public class ModelVersionRequirementVO {
     private LocalDateTime mtime;
 
     /**
-     * 需求审核状态0:未通过1:通过
+     * 需求审核状态 0:未通过, 1:通过
      */
     @ApiModelProperty(value = "需求审核状态 0:未通过, 1:通过")
     private Integer requirementStatus;
@@ -204,7 +210,7 @@ public class ModelVersionRequirementVO {
      * 审批状态 0:未审核 1：审核通过 2：审核拒绝
      */
     @ApiModelProperty(value = "审批状态 0:未审核 1：审核通过 2：审核拒绝")
-    private Integer approvalStats;
+    private Integer approvalStatus;
 
     /**
      * 审核人单位