Merge remote-tracking branch 'origin/dev_20230808_OTA' into dev_20230808_OTA

This commit is contained in:
zyx.net
2023-08-22 14:45:39 +08:00
@@ -8,7 +8,7 @@
<result column="update_by" property="updateBy" /> <result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" /> <result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" /> <result column="sys_org_code" property="sysOrgCode" />
<result column="issue_key" property="issueKey" /> <result column="vdr" property="vdr" />
<result column="project_version" property="projectVersion" /> <result column="project_version" property="projectVersion" />
<result column="attestation_schedule" property="attestationSchedule" /> <result column="attestation_schedule" property="attestationSchedule" />
<result column="match_status" property="matchStatus" /> <result column="match_status" property="matchStatus" />
@@ -136,7 +136,7 @@
LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id
LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id
WHERE oma.issue_key = #{vdr} WHERE oma.vdr = #{vdr}
GROUP BY plb.id GROUP BY plb.id
</select> </select>