modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
@@ -1,5 +1,6 @@ package com.zt.life.modules.testCheckOrder.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.zt.common.entity.BusiEntity; @@ -32,16 +33,10 @@ private Long configItemId; @ApiModelProperty(value = "配置项类型") private Long configItemType; private Long pageCode; @ApiModelProperty(value = "编号") private String code; @ApiModelProperty(value = "项目标识") private String softwareIdentity; @ApiModelProperty(value = "项目名称") private String softwareName; @ApiModelProperty(value = "检查人") private String examiner; @@ -79,4 +74,12 @@ @ApiModelProperty(value = "年份") private String year; @TableField(exist = false) @ApiModelProperty(value = "项目标识") private String softwareIdentity; @TableField(exist = false) @ApiModelProperty(value = "项目名称") private String softwareName; } modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderDao.xml
@@ -4,9 +4,9 @@ <mapper namespace="com.zt.life.modules.testCheckOrder.dao.TestCheckOrderDao"> <select id="getList" resultType="com.zt.life.modules.testCheckOrder.model.TestCheckOrder"> select a.* ,p.* select a.* ,p.software_identity,p.software_name from test_check_order a INNER JOIN project p ON p.id = a.project_id INNER JOIN project p ON p.id = a.project_id <where> a.is_delete = 0 and p.is_delete = 0 <if test="whereSql!=null"> web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -382,7 +382,7 @@ }, // 表单提交 async formSubmit(submitType) { /* if (this.stepMarker=='' && submitType == 'bl') { /* if (this.stepMarker=='wplz_first' && submitType == 'bl') { for(666) if (this.pageNameCode[row.itemName] && !row.isCheck) { alert(444)
