Commit 0fa74d9f by 高晓磊

根据船只id查询采砂许可证信息

parent 2368b719
...@@ -24,4 +24,7 @@ public interface SandMiningDao extends BaseDao { ...@@ -24,4 +24,7 @@ public interface SandMiningDao extends BaseDao {
void updateSandMiningStatus(); void updateSandMiningStatus();
List<KObject> queryByShipId(UUID fromString);
} }
...@@ -43,9 +43,7 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao, ...@@ -43,9 +43,7 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
@Override @Override
public Page<KObject> listSandMiningInfoPaging(Page<KObject> page, Integer sandMiningStatus) { public Page<KObject> listSandMiningInfoPaging(Page<KObject> page, Integer sandMiningStatus) {
KClass bean = Amino.getStaticMetadataContext().getBean(SandMiningConstant.ENTITY, KClass.class); DetachedCriteria detachedCriteria = getDetachedCriteria();
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq("del", false));
if (null != sandMiningStatus) { if (null != sandMiningStatus) {
detachedCriteria.add(Restrictions.eq("status", sandMiningStatus)); detachedCriteria.add(Restrictions.eq("status", sandMiningStatus));
} }
...@@ -62,11 +60,8 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao, ...@@ -62,11 +60,8 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
@Override @Override
public List<KObject> getByCodeNum(String permitCode, UUID id) { public List<KObject> getByCodeNum(String permitCode, UUID id) {
KClass bean = Amino.getStaticMetadataContext().getBean(SandMiningConstant.ENTITY, KClass.class); DetachedCriteria detachedCriteria = getDetachedCriteria();
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
dinasTypeDao.addRegionalCompanyFilter(detachedCriteria); dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("permitCode", permitCode)); detachedCriteria.add(Restrictions.eq("permitCode", permitCode));
if (id != null) { if (id != null) {
detachedCriteria.add(Restrictions.ne("id", id)); detachedCriteria.add(Restrictions.ne("id", id));
...@@ -75,6 +70,14 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao, ...@@ -75,6 +70,14 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
return (List<KObject>) template.findByCriteria(detachedCriteria); return (List<KObject>) template.findByCriteria(detachedCriteria);
} }
private DetachedCriteria getDetachedCriteria() {
KClass bean = Amino.getStaticMetadataContext().getBean(SandMiningConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq("del", false));
return detachedCriteria;
}
@Override @Override
public void modify(KObject kobject) { public void modify(KObject kobject) {
// kobject.set(BaseConstants.CREATOR,id.get(BaseConstants.CREATOR)); // kobject.set(BaseConstants.CREATOR,id.get(BaseConstants.CREATOR));
...@@ -125,6 +128,13 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao, ...@@ -125,6 +128,13 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
}); });
} }
@Override
public List<KObject> queryByShipId(UUID fromString) {
DetachedCriteria detachedCriteria = getDetachedCriteria();
detachedCriteria.add(Restrictions.eq("status",1));
return (List<KObject>) template.findByCriteria(detachedCriteria);
}
@Override @Override
public UUID create(KObject kObject) { public UUID create(KObject kObject) {
......
...@@ -2,6 +2,7 @@ package com.xyst.dinas.production.internal.service; ...@@ -2,6 +2,7 @@ package com.xyst.dinas.production.internal.service;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -123,5 +124,15 @@ public class SandMiningServiceImpl implements SandMiningService { ...@@ -123,5 +124,15 @@ public class SandMiningServiceImpl implements SandMiningService {
} }
@Override
public List<Map<String, Object>> queryByShip(List<Map<String, Object>> shipsTracking) {
for (Map<String, Object> stringObjectMap : shipsTracking) {
Object shipInfoId = stringObjectMap.get("shipInfoId");
List<KObject> sandMin = sandMiningDao.queryByShipId(UUID.fromString(shipInfoId.toString()));
stringObjectMap.put("sandMiningInfo",sandMin);
}
return shipsTracking;
}
} }
...@@ -3,6 +3,8 @@ package com.xyst.dinas.production.service; ...@@ -3,6 +3,8 @@ package com.xyst.dinas.production.service;
import com.beecode.bap.attachment.common.Page; import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject; import com.beecode.bcp.type.KObject;
import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
public interface SandMiningService { public interface SandMiningService {
...@@ -24,4 +26,6 @@ public interface SandMiningService { ...@@ -24,4 +26,6 @@ public interface SandMiningService {
void updateIsEnterWarningArea(); void updateIsEnterWarningArea();
List<Map<String, Object>> queryByShip(List<Map<String, Object>> shipsTracking);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment