需求修改test6

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

@@ -67,7 +67,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
         modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode());
         modelRequirementApproval.setApprovalStatus(0);
         // 校验是否模型名称重复
-        ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getModelTable(), null, null);
+        ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getModelTable(), null, modelVersionRequirementDTO.getModelName());
 
         if (modelBaseVersion1 != null) {
             return -1;

src/main/java/com/pms/ocp/controller/ModelControlDemandController.java

@@ -41,7 +41,7 @@ public class ModelControlDemandController {
         Integer integer = bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO);
 
         if (integer.equals(-1)) {
-            return ResponseVO.ok(CodeEnum.MODEL_NAME_REPETITION.getDesc());
+            return ResponseVO.error(CodeEnum.MODEL_NAME_REPETITION);
         }
 
         return ResponseVO.ok(integer);

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

@@ -3,7 +3,9 @@ package com.pms.ocp.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
@@ -17,19 +19,31 @@ import java.time.LocalDateTime;
 @TableName("ocp_model_audit")
 public class ModelAudit {
 
+    /**
+     * 事记表主键
+     */
     @TableId(value = "obj_id", type = IdType.ASSIGN_ID)
     private String objId;
 
     /**
      * 模型代码
      */
-    private int modelCode;
+    private String modelCode;
 
     /**
      * 属性代码
      */
-    private int propCode;
+    private String propCode;
 
+    /**
+     * 异动类型 0:新增,1:迭代
+     */
+    private Integer operStatus;
+
+    /**
+     * 操作对象0:表，1:属性
+     */
+    private Integer operTarget;
 
     /**
      * 事记类型 0:人工操作,1:流程管控,3:总部下发
@@ -41,11 +55,6 @@ public class ModelAudit {
      */
     private String auditMessageJson;
 
-    /**
-     * 异动类型 0:新增,1:迭代
-     */
-    private int operStatus;
-
     /**
      * 异动申请人id
      */
@@ -57,39 +66,50 @@ public class ModelAudit {
     private String applyUserName;
 
     /**
-     * 异动时间
+     * 提交人id
      */
-    private long applyTime;
+    private String auditUserId;
 
     /**
-     * 版本
+     * 提交人姓名
      */
-    private String applyVersion;
+    private String auditUserName;
+
+    /**
+     * 异动时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime applyTime;
 
     /**
-     * 新增时间
+     * 事记新增时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime auditCtime;
 
     /**
-     * 异动公司编号
+     * 事记修改时间
      */
-    private String auditCompanyCode;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime auditMtime;
 
     /**
-     * 提交人id
+     * 版本
      */
-    private String auditUserId;
+    private String applyVersion;
 
     /**
-     * 提交人姓名
+     * 异动公司编号
      */
-    private String auditUserName;
+    private String auditCompanyCode;
 
     /**
-     * 修改时间
+     * 上一版本
      */
-    private LocalDateTime auditMtime;
+    private String preModelVersion;
 
 }
 

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

@@ -9,6 +9,7 @@ import lombok.Data;
  */
 @Data
 public class ModelAcceptListVo {
+
     private String modelCode;
     private String modelName;
     private String requirementCode;

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

 package com.pms.ocp.model.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -22,7 +21,7 @@ import java.time.LocalDateTime;
 public class ModelPropertyVersionRequirementVO {
 
     /**
-     * 主键
+     * 属性版本表主键
      */
     @ApiModelProperty(value = "主键")
     @TableId(value = "obj_id", type = IdType.ASSIGN_ID)
@@ -34,6 +33,12 @@ public class ModelPropertyVersionRequirementVO {
     @ApiModelProperty(value = "模型编码")
     private String modelCode;
 
+    /**
+     * 模型名称
+     */
+    @ApiModelProperty(value = "模型名称")
+    private String modelName;
+
     /**
      * 属性名称
      */
@@ -60,8 +65,9 @@ public class ModelPropertyVersionRequirementVO {
 
     /**
      * 数据类型
+     * 1：数值，2：货币，3：字符，4：时间日期，5：布尔
      */
-    @ApiModelProperty(value = "数据类型")
+    @ApiModelProperty(value = "数据类型 1：数值，2：货币，3：字符，4：时间日期，5：布尔")
     private String dataType;
 
     /**
@@ -80,14 +86,12 @@ public class ModelPropertyVersionRequirementVO {
      * 是否主键 0:否,1:是
      */
     @ApiModelProperty(value = "是否主键 0:否,1:是")
-    @TableField("is_pk")
     private Integer boolPk;
 
     /**
      * 是否必填 0:否,1:是
      */
     @ApiModelProperty(value = "是否必填 0:否,1:是")
-    @TableField("is_required")
     private Integer boolRequired;
 
     /**
@@ -154,6 +158,12 @@ public class ModelPropertyVersionRequirementVO {
     @ApiModelProperty(value = "需求提报公司")
     private String companyCode;
 
+    /**
+     * 需求提报公司名称
+     */
+    @ApiModelProperty(value = "需求提报公司名称")
+    private String companyName;
+
     /**
      * 提交人id
      */

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

 package com.pms.ocp.model.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +23,6 @@ public class ModelVersionRequirementVO {
      * 主键
      */
     @ApiModelProperty(value = "主键")
-    @TableId(value = "obj_id", type = IdType.ASSIGN_ID)
     private String objId;
 
     /**
@@ -171,6 +168,12 @@ public class ModelVersionRequirementVO {
     @ApiModelProperty(value = "需求提报公司")
     private String companyCode;
 
+    /**
+     * 需求提报公司名称
+     */
+    @ApiModelProperty(value = "需求提报公司名称")
+    private String companyName;
+
     /**
      * 提交人id
      */
@@ -205,12 +208,11 @@ public class ModelVersionRequirementVO {
     @ApiModelProperty(value = "需求审核状态 0:未通过, 1:通过")
     private Integer requirementStatus;
 
-
     /**
      * 审批状态 0:未审核 1：审核通过 2：审核拒绝
      */
     @ApiModelProperty(value = "审批状态 0:未审核 1：审核通过 2：审核拒绝")
-    private Integer approvalStatus;
+    private Integer approvalStats;
 
     /**
      * 审核人单位

src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java

@@ -81,15 +81,15 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
         QueryWrapper<ModelBaseVersion> queryWrapper = new QueryWrapper();
 
         if (StringUtils.isNotEmpty(modelTable)) {
-            queryWrapper.lambda().eq(ModelBaseVersion::getModelTable, modelTable);
+            queryWrapper.lambda().or().eq(ModelBaseVersion::getModelTable, modelTable);
         }
 
         if (StringUtils.isNotEmpty(modelCode)) {
-            queryWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelCode);
+            queryWrapper.lambda().or().eq(ModelBaseVersion::getModelCode, modelCode);
         }
 
         if (StringUtils.isNotEmpty(modelName)) {
-            queryWrapper.lambda().eq(ModelBaseVersion::getModelName, modelName);
+            queryWrapper.lambda().or().eq(ModelBaseVersion::getModelName, modelName);
         }
 
         return modelBaseVersionMapper.selectOne(queryWrapper);

src/main/resources/mapper/ModelRequirementMapper.xml

@@ -20,10 +20,66 @@
     <!--    </insert>-->
 
 
+<!--    "objId": "1513800076667731970",-->
+<!--    "modelCode": "MV1649753030765",-->
+<!--    "modelName": "模型名称顶顶顶",-->
+<!--    "modelTable": "表名称3",-->
+<!--    "requirementCode": "MR-1649753037946",-->
+<!--    "equipType": null,-->
+<!--    "professionalKind": null,-->
+<!--    "modelGroupCode": "gwzl",-->
+<!--    "ownerCompanyCode": "省公司编码",-->
+<!--    "modelOrderNo": null,-->
+<!--    "modelUserId": "提交人id",-->
+<!--    "modelUserName": "提交人姓名",-->
+<!--    "modelCtime": "2022-04-12 16:43:57",-->
+<!--    "modelMtime": null,-->
+<!--    "modelZone": null,-->
+<!--    "modelLayer": null,-->
+<!--    "modelVersion": "2",-->
+<!--    "apiUnit": null,-->
+<!--    "modelVersionDesc": null,-->
+<!--    "modelPromotion": 1,-->
+<!--    "boolDelete": null,-->
+<!--    "requirementType": 0,-->
+<!--    "requirementDesc": "需求描述顶顶顶",-->
+<!--    "companyCode": "078002018001001",-->
+<!--    "userId": "提交人id",-->
+<!--    "userName": "提交人姓名",-->
+<!--    "ctime": "2022-04-12 16:43:57",-->
+<!--    "mtime": null,-->
+<!--    "requirementStatus": null,-->
+<!--    "approvalStatus": null,-->
+<!--    "approvalCompanyCode": null,-->
+<!--    "approvalDepartment": null,-->
+<!--    "approvalUserId": null,-->
+<!--    "approvalUserName": null,-->
+<!--    "approvalCtime": null,-->
+<!--    "approvalMtime": null,-->
+<!--    "approvalComment": null-->
+
+
     <select id="listModelRequirementVO" resultType="com.pms.ocp.model.vo.ModelVersionRequirementVO">
-        select * from ocp_model_version omv
+        select omr.obj_id as obj_id,
+
+               omv.model_code, omv.model_name, omv.model_table, omv.model_version as model_version,
+               omv.equip_type, omv.professional_kind, omv.model_group_code, omv.owner_company_code,
+               omv.model_order_no, omv.model_user_id, omv.model_user_name, omv.model_ctime,
+               omv.model_mtime, omv.model_zone, omv.model_layer,
+               omv.api_unit, omv.model_version_desc, omv.model_promotion, omv.is_delete as bool_delete,
+
+                omra.approval_stats, omra.approval_company_code, omra.approval_department, omra.approval_user_id,
+                omra.approval_user_name, omra.approval_ctime, omra.approval_mtime, omra.approval_comment,
+
+                oo.org_name as company_name,
+
+                omr.user_id, omr.user_name, omr.ctime, omr.mtime,omr.company_code,
+                omr.requirement_code, omr.requirement_status, omr.requirement_type, omr.requirement_desc
+
+        from ocp_model_version omv
         left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
         left join ocp_model_requirement_approval omra on omra.requirement_code = omr.requirement_code
+        join ocp_organization oo on omr.company_code = oo.org_code
         <where>
 
             <if test="modelCode != null and modelCode != ''">
@@ -44,9 +100,20 @@
     </select>
 
     <select id="listModelPropertyVersionRequirementVO" resultType="com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO">
-        select * from ocp_model_prop_version ompv
+        select ompv.obj_id, ompv.column_name, ompv.prop_code, ompv.column_comments, ompv.data_type, ompv.data_length,
+               ompv.data_scale, ompv.is_pk as bool_pk, ompv.is_required as bool_required,
+               ompv.prop_order_no, ompv.prop_user_id, ompv.prop_user_name, ompv.prop_ctime,
+               ompv.prop_mtime, ompv.prop_promotion, ompv.requirement_code,
+               ompv.prop_requirement_type, ompv.prop_requirement_desc,
+
+               omr.company_code, omr.user_id, omr.user_name, omr.ctime, omr.mtime, omr.requirement_status,
+
+                omv.model_code, omv.model_name, omv.model_version as model_version,
+                oo.org_name as company_name
+        from ocp_model_prop_version ompv
             left join ocp_model_version omv on omv.model_code = ompv.model_code and omv.requirement_code = ompv.requirement_code
             left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
+            join ocp_organization oo on omr.company_code = oo.org_code
         <where>
             <if test="modelCode != null and modelCode != ''">
                 and ompv.model_code = #{modelCode}
@@ -63,4 +130,33 @@
     </select>
 
 
+<!--    "objId": "1513825670134616065",-->
+<!--    "modelCode": "MV1649753030765",-->
+<!--    "modelName": "模型名称顶顶顶",-->
+<!--    "columnName": "属性名称杀杀杀",-->
+<!--    "modelVersion": null,-->
+<!--    "propCode": "属性代码",-->
+<!--    "columnComments": "属性描述",-->
+<!--    "dataType": "属性类型",-->
+<!--    "dataLength": 0,-->
+<!--    "dataScale": 0,-->
+<!--    "boolPk": null,-->
+<!--    "boolRequired": null,-->
+<!--    "propOrderNo": null,-->
+<!--    "propUserId": "提交人id",-->
+<!--    "propUserName": "提交人姓名",-->
+<!--    "propCtime": "2022-04-12 18:25:39",-->
+<!--    "propMtime": null,-->
+<!--    "propPromotion": 0,-->
+<!--    "requirementCode": "MR-1649753037946",-->
+<!--    "propRequirementType": 0,-->
+<!--    "propRequirementDesc": "需求描述",-->
+<!--    "companyCode": "省公司编码",-->
+<!--    "userId": "提交人id",-->
+<!--    "userName": "提交人姓名",-->
+<!--    "ctime": "2022-04-12T16:43:57.946",-->
+<!--    "mtime": null,-->
+<!--    "requirementStatus": null-->
+
+
 </mapper>