diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index c7c9a8d8..4f517653 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -131,17 +131,7 @@ public class RepairAuditDetailsController extends BaseController { - - - - - - - - - - - //--------------------------------------------------------------------------------- + //--------------------TOP--COPY--------------------------BUTTON--GENDER--------------- /** diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 3dcd2c0e..d047453d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND (locate(#{keyword}, su.nick_name) > 0 or locate(#{keyword}, tk.CODE) > 0 or locate(#{keyword}, bui.unit_name) > 0 - or locate(#{keyword}, bpl.lot_name) > 0) + or locate(#{keyword}, bpl.pro_name) > 0) and bui.unit_id = #{backUnit} @@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tk.task_status = #{taskStatus} - and bpl.lot_id = #{backPro} + and bpl.pro_id = #{backPro} and mt1.type_id = #{type}