Skip to content

C
cloud-fb
Commit 252ef90a by 王衍超
Options

Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

parents 97d6fe21 6642a91c
Showing with 54 additions and 40 deletions
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/SandMiningAreaDao.java
......@@ -24,4 +24,6 @@ public interface SandMiningAreaDao extends BaseDao {
void modify(KObject kobject);
Object groupByDischarging(List<UUID> regionalCompanyIds);
List<KObject> ListByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude);
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/SandMiningAreaDaoImpl.java
......@@ -10,6 +10,7 @@ import com.beecode.inz.common.BaseConstants;
import com.xyst.dinas.biz.constant.SandMiningAreaConstant;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.SandMiningAreaDao;
import com.xyst.dinas.biz.enumeration.SandMiningAreaTypeEnum;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
......@@ -81,8 +82,8 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
KObject staff = AminoContextHolder.getContext().getStaff();
kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
kobject.set("modifyTime",new Date());
kobject.set(BaseConstants.MODIFIER,staff);
kobject.set("del",false);
kobject.set(BaseConstants.MODIFIER,staff);
template.merge(kobject);
//生成采区预警设置信息
}
......@@ -98,6 +99,23 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
return template.findByCriteria(detachedCriteria);
}
@Override
public List<KObject> ListByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude) {
DetachedCriteria detachedCriteria = getDetachedCriteria(regionalCompanyIds);
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("status", 2));
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
if(!isInclude){
detachedCriteria.add(Restrictions.in("sandMiningAreaType",
SandMiningAreaTypeEnum.ABANDONED_MINE_SAND.getValue(),
SandMiningAreaTypeEnum.CAN_MINE_SAND.getValue(),
SandMiningAreaTypeEnum.PRESERVE.getValue()));
}
detachedCriteria.addOrder(Order.desc("sortOrder"));
return (List<KObject>)template.findByCriteria(detachedCriteria);
}
private DetachedCriteria getDetachedCriteria(List<UUID> regionalCompanyIds) {
KClass bean = Amino.getStaticMetadataContext().getBean(SandMiningAreaConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/DinasTypeServiceImpl.java
......@@ -72,4 +72,9 @@ public class DinasTypeServiceImpl implements DinasTypeService {
public List<KObject> getByRegionalCompanyId(UUID regionalCompanyId) {
return dinasTypeDao.getByRegionalCompanyId(regionalCompanyId);
}
@Override
public List<KObject> getStationsById(List<UUID> dinasTypeIds, List<UUID> regionalCompanyIds) {
return dinasTypeDao.getStationsById(dinasTypeIds,regionalCompanyIds);
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/SandMiningAreaServiceImpl.java
......@@ -4,15 +4,12 @@ import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.biz.dao.SandMiningAreaDao;
import com.xyst.dinas.biz.service.SandMiningAreaService;
import com.xyst.dinas.biz.warn.WarnSetting;
import com.xyst.dinas.biz.warn.WarnSettingConstant;
import com.xyst.dinas.biz.warn.WarnSettingEntity;
import com.xyst.dinas.biz.warn.WarnTargetTypeEnum;
import com.xyst.dinas.biz.warn.WarningServiceImpl;
import com.xyst.dinas.biz.warn.service.WarningService;
import org.apache.commons.collections.CollectionUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
......@@ -101,14 +98,14 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
}
@Override
public List<HashMap<String, Object>> listByRegionalCompanyIds(List<UUID> regionalCompanyIds) {
public List<HashMap<String, Object>> listByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude) {
//查询所有采区
HashMap<String, Object> whereMap = new HashMap<>(1);
whereMap.put("status",2);
whereMap.put("del",false);
List<KObject> kObjects = sandMiningAreaDao.listByAttributes(whereMap);
List<KObject> kObjects = sandMiningAreaDao.ListByRegionalCompanyIds (regionalCompanyIds,isInclude);
List<HashMap<String,Object>> regionalCompanyList = new ArrayList<>();
HashMap<String, Object> regionalCompany = new HashMap<>(1);
HashMap<String, Object> regionalCompany;
HashMap<String, Object> temp = new HashMap<>(12);
HashMap<String, Object> area;
ArrayList<HashMap<String, Object>> sandMiningAreas1;
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/DinasTypeService.java
......@@ -28,4 +28,6 @@ public interface DinasTypeService {
List<KObject> getByStation(UUID id);
List<KObject> getByRegionalCompanyId(UUID regionalCompanyId);
List<KObject> getStationsById(List<UUID> dinasTypeIds, List<UUID> regionalCompanyIds);
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/SandMiningAreaService.java
......@@ -25,5 +25,5 @@ public interface SandMiningAreaService {
Object groupByDischarging(List<UUID> regionalCompanyIds);
List<HashMap<String, Object>> listByRegionalCompanyIds(List<UUID> regionalCompanyIds);
List<HashMap<String, Object>> listByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude);
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/DinasTypeController.java
......@@ -36,6 +36,17 @@ public class DinasTypeController {
return ResponseObj.success("操作成功",kObjectPage);
}
@RequestMapping(value = "list/getStationsById", method = RequestMethod.GET)
public ResponseObj getStationsById(
@RequestParam(name = "dinasTypeIds",required = false) List<UUID> dinasTypeIds,
@RequestParam(name = "regionalCompanyIds",required = false) List<UUID> regionalCompanyIds) throws Exception {
List<KObject> kObjects = dinasTypeService.getStationsById(dinasTypeIds,regionalCompanyIds);
return ResponseObj.success("操作成功",kObjects);
}
/**
* 新建砂石种类
* @param body
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/SandMiningAreaController.java
......@@ -6,19 +6,16 @@ import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.nlib.utils.StringUtils;
import com.xyst.dinas.biz.constant.SandMiningAreaConstant;
import com.xyst.dinas.biz.request.UpdateWarnSetting;
import com.xyst.dinas.biz.service.SandMiningAreaService;
import com.xyst.dinas.biz.warn.BaseBusinessWarn;
import com.xyst.dinas.biz.warn.WarnSetting;
import com.xyst.dinas.biz.warn.service.WarningService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.imageio.event.IIOWriteWarningListener;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
......@@ -53,9 +50,10 @@ public class SandMiningAreaController {
@RequestMapping(value = "list/byRegionalCompanyIds", method = RequestMethod.GET)
public ResponseObj listByRegionalCompanyIds(
@RequestParam(name = "regionalCompanyIds",required = false) List<UUID> regionalCompanyIds
@RequestParam(name = "regionalCompanyIds",required = false) List<UUID> regionalCompanyIds,
@RequestParam(name = "isInclude",required = false,defaultValue = "false") Boolean isInclude
) throws Exception {
List<HashMap<String,Object>> sandMiningAreas= sandMiningAreaService.listByRegionalCompanyIds(regionalCompanyIds);
List<HashMap<String,Object>> sandMiningAreas= sandMiningAreaService.listByRegionalCompanyIds(regionalCompanyIds,isInclude);
return ResponseObj.success("查询成功",sandMiningAreas);
}
......@@ -112,7 +110,7 @@ public class SandMiningAreaController {
* @return
*/
@PutMapping("approve")
public ResponseObj approve(@RequestParam("status") Integer status ,@RequestParam("id") UUID id){
public ResponseObj approve(@RequestParam(value = "failureReason",required = false) String failureReason ,@RequestParam("status") Integer status ,@RequestParam("id") UUID id){
if(id == null){
return ResponseObj.error(400,"'id' must be not null!");
......@@ -122,6 +120,9 @@ public class SandMiningAreaController {
}
KObject byId = sandMiningAreaService.getById(id);
byId.set("status",status);
if(StringUtils.isNotBlank(failureReason)){
byId.set("failureReason",failureReason);
}
sandMiningAreaService.update(byId);
return ResponseObj.success("审批成功");
}
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/DinasType.jmx
......@@ -61,21 +61,6 @@
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</m:type>
</m:annotation>
</m:annotations>
<m:id>726e8dac-46c8-429f-94db-9922840c5998</m:id>
<m:name>stations</m:name>
<m:title>售卖该砂石的场站</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Station$DinasTypeDetail[]</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations></m:annotations>
<m:id>bd60d3ff-9308-4f15-aa1e-67d2923192f2</m:id>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station$DinasTypeDetail.jmx
......@@ -25,11 +25,6 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.json.JsonIgnore</m:type>
</m:annotation>
</m:annotations>
<m:id>61699557-6afc-43c2-adeb-fecfeb844536</m:id>
<m:name>dinasType</m:name>
<m:title>砂石类型</m:title>
......
backend/xyst.dinas.biz/src/main/resources/config/DinasType.hbm.xml
......@@ -56,10 +56,6 @@
<comment>砂石是否售卖,0不售卖 1还售卖</comment>
</column>
</property>
<!-- <bag name="stations" cascade="none" inverse="true" lazy="extra">-->
<!-- <key column="dinas_type_id" not-null="true" />-->
<!-- <one-to-many entity-name="com.xyst.dinas.biz.datamodel.Station$DinasTypeDetail"/>-->
<!-- </bag>-->
<property name="reason" type="nstring" not-null="false">
<column name="reason" length="300" >
<comment>备注</comment>
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/ProductionPlanReportDaoImpl.java
......@@ -90,6 +90,7 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
KObject staff = AminoContextHolder.getContext().getStaff();
kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
kobject.set("modifyTime",new Date());
kobject.set("warehousingStatus",id.getBoolean("warehousingStatus"));
kobject.set(BaseConstants.MODIFIER,staff);
kobject.set(BaseConstants.DEL,false);
template.merge(kobject);
......@@ -163,6 +164,7 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
kObject.set("id",UUID.randomUUID());
}
kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
kObject.set("warehousingStatus", false);
kObject.set(BaseConstants.CREATOR,staff);
kObject.set(BaseConstants.CREATE_TIME, new Date());
kObject.set("del",false);
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/ProductionPlanReportServiceImpl.java
......@@ -187,7 +187,7 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
dinasTypeDetailJson.put("stationId",stationId.toString());
dinasTypeDetailJson.put("stationName",stationName);
dinasTypeDetailJson.put("dinasTypeId",dinasTypeDetail.getUuid("id").toString());
dinasTypeDetailJson.put("dinasTypeName",dinasTypeDetail.getString("dinasTypeName"));
dinasTypeDetailJson.put("dinasTypeName",dinasTypeDetail.get("dinasType").get("dinasTypeName"));
dinasTypeDetailJson.put("amount",dinasTypeDetail.getDouble("dinasWeight"));
strings.add(dinasTypeDetailJson);
}
......
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