diff --git a/resources/mybatis/scrap/ScrapTaskRecordMapper.xml b/resources/mybatis/scrap/ScrapTaskRecordMapper.xml index cc933be..261c6c2 100644 --- a/resources/mybatis/scrap/ScrapTaskRecordMapper.xml +++ b/resources/mybatis/scrap/ScrapTaskRecordMapper.xml @@ -35,6 +35,7 @@ OR mam.ASSETS_NUM LIKE CONCAT('%',#{param.keyWord},'%') OR mam.DEVICE_CODE LIKE CONCAT('%',#{param.keyWord},'%') OR mam.REMARK LIKE CONCAT('%',#{param.keyWord},'%') + OR sup2.NUMBER LIKE CONCAT('%',#{param.keyWord},'%') ) ORDER BY wir.TIME DESC diff --git a/src/com/bonus/bm/controller/ProjectManageController.java b/src/com/bonus/bm/controller/ProjectManageController.java index 1e25a05..39d885d 100644 --- a/src/com/bonus/bm/controller/ProjectManageController.java +++ b/src/com/bonus/bm/controller/ProjectManageController.java @@ -181,6 +181,10 @@ public class ProjectManageController extends BaseController { ar.setFailMsg("请选择所在区"); } else { pmService.insert(o); + //塞入bid_id + if (o.getId()!=null){ + pmService.updateBidId(o); + } ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED); } } else {