diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index a2e778f1..bdcccede 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -531,7 +531,7 @@ company_id, - audit_remark, + remark, scrap_type, 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 8761c399..893996a8 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 @@ -293,7 +293,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetails.setCompanyId((long) companyId); - scrapApplyDetails.setAuditRemark(bean.getScrapReason()); + scrapApplyDetails.setRemark(bean.getScrapReason()); //根据fileIds获取所有的图片地址 if (StringUtils.isNotEmpty(bean.getFileIds())){ String[] fileIsList = bean.getFileIds().split(",");