فهرست منبع

fix:备货单搜索内容不能搜索补货员名称的bug

wangzhinan 3 سال پیش
والد
کامیت
f216b0954c
1فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 3 3
      svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

+ 3 - 3
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

@ -241,7 +241,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    public JSONObject queryUpListFullInfo(
            String startTime, String endTime, String replenishErAndTrackNum,
            String startTime, String endTime, String content,
            String community, String userId, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
@ -328,8 +328,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            conditionSql += " AND  t.doc_time >= '" + startTime +"'" +
                    " AND t.doc_time <= '" + endTime + "'";
        }
        if (!StringUtils.isEmpty(replenishErAndTrackNum)){
            conditionSql += " and t.doc_num like '%" + replenishErAndTrackNum + "%'";
        if (!StringUtils.isEmpty(content)){
            conditionSql += " and concat(ifnull(t.`doc_num`,''),ifnull(bu.`name`, '')) like '%" + content + "%'";
        }
        if (!StringUtils.isEmpty(community)){
            conditionSql += " and t.community = '" + community + "'";