bom信息查询失效时间修改

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java

@@ -91,19 +91,20 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         MesBomTreeModel organize = new MesBomTreeModel();
 
         organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
-        organize.setName(AuthUtil.getOrganize().getName());
-
+       // organize.setName(AuthUtil.getOrganize().getName());
+        organize.setName("zxw");
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
         DdlPreparedPack.getStringEqualPack(bom.getBomCode(), "bomCode", packBean);
         DdlPreparedPack.getStringSmallerPack(bom.getEffStartTime(), "effStartTime", packBean);
-        MesConfig config = mesConfigService.getCfgValueByCode(bom.getOrganizeCode(), MES_REPORT_FIND_BOM_WITH_EFFENDTIME);
-        Boolean isWithEffEndTime = (null != config && !StringUtils.isEmpty(config.getCfgValue()) && config.getCfgValue().equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValueStr())) ? true : false;
-        if (isWithEffEndTime) {
-            DdlPreparedPack.getStringBiggerPack(bom.getEffStartTime(), "effEndTime", packBean);
-        }
+
+
+
+        String sql = " and (model.effEndTime = '' or model.effEndTime is null or model.effEndTime >= '" + bom.getEffStartTime()  + "' )" ;
+        packBean.setWhereAppend(packBean.getWhereAppend() +  sql);
         packBean.setOrderByStr(" order by createDatetime desc ");
+
         pager = PagerHelper.getPager(pager, baseRDao.findByHqlWhereCount(packBean));
 
         List<MesBom> bomList = baseRDao.findByHqlWherePage(packBean, pager);