diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 7addac16..9db0cfbc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -240,7 +240,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setScrapNum(scrapNum); scrapApplyDetails.setScrapSource("2"); scrapApplyDetails.setStatus("0"); - scrapApplyDetails.setParentId(taskId); + scrapApplyDetails.setParentId(repairAuditDetails.getId()); scrapApplyDetails.setCreateById(SecurityUtils.getUserId()); scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index a5847fe6..b4d6a62f 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml @@ -50,7 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id LEFT JOIN scrap_apply_details sad ON tk.task_id = sad.task_id - LEFT JOIN tm_task tk1 ON sad.parent_id = tk1.task_id + LEFT JOIN repair_audit_details rad ON sad.parent_id = rad.id + LEFT JOIN repair_apply_details rad2 ON rad.repair_id = rad2.id + LEFT JOIN tm_task tk1 ON rad2.task_id = tk1.task_id LEFT JOIN ( SELECT id,