Skip to content

C
cloud-fb
Commit 01cfd3f7 by 焦凯
Options

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

parents 0f47b796 bf67b66e
Showing with 819 additions and 31 deletions
backend/inz.common/src/main/java/com/beecode/inz/common/util/DateTimeUtils.java
......@@ -307,9 +307,9 @@ public class DateTimeUtils {
/**
* 判断2个日期是否同月
* eg: isSameYear(2020-12-31,2021-01-01) false
* isSameYear(2020-12-31,2020-12-01) true
* isSameYear(2020-12-31,2021-12-01) true
* eg: isSameMonth(2020-12-31,2021-01-01) false
* isSameMonth(2020-12-31,2020-12-01) true
* isSameMonth(2020-12-31,2021-12-01) true
* @return Boolean
*/
public static Boolean isSameMonth(Date startDate , Date endDate) {
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/SandMiningAreaDao.java
......@@ -25,5 +25,5 @@ public interface SandMiningAreaDao extends BaseDao {
Object groupByDischarging(List<UUID> regionalCompanyIds);
List<KObject> ListByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude);
List<KObject> listByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude);
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/init/OrganizationDataInitializer.java
......@@ -53,7 +53,6 @@ public class OrganizationDataInitializer implements DataInitializer {
kObject.set(BaseConstants.CREATE_TIME, new Date());
dinasOrganizationService.save(kObject);
saveFollower(kObject);
dinasOrganizationService.createRelDepartment(kObject.getUuid("id"));
} else{
KObject organizationByName = dinasOrganizationService.queryOrganizationByName(kObject.getString("name"));
saveFollower(organizationByName);
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/SandMiningAreaDaoImpl.java
......@@ -92,6 +92,7 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
public Object groupByDischarging(List<UUID> regionalCompanyIds) {
DetachedCriteria detachedCriteria = getDetachedCriteria(regionalCompanyIds);
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("status", 2));
detachedCriteria.setProjection(Projections.projectionList()
.add(Projections.alias(Projections.sum("sandMiningQuantity"),"sandMiningQuantity"))
.add(Projections.alias(Projections.groupProperty("regionalCompany.id"),"regionalCompany")));
......@@ -100,11 +101,13 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
}
@Override
public List<KObject> ListByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude) {
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(!CollectionUtils.isEmpty(regionalCompanyIds)){
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
}
if(!isInclude){
detachedCriteria.add(Restrictions.in("sandMiningAreaType",
SandMiningAreaTypeEnum.ABANDONED_MINE_SAND.getValue(),
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java
......@@ -184,8 +184,9 @@ public class StationDaoImpl extends AbstractBaseDao implements StationDao, Stat
@Override
public List<KObject> queryStationByRegionalCompany(UUID id) {
return template.execute(session -> {
Query<KObject> query = session.createQuery(" from " + StationConstant.ENTITY + " where regionalCompany.id=:id ", KObject.class);
Query<KObject> query = session.createQuery(" from " + StationConstant.ENTITY + " where regionalCompany.id=:id and del=:del", KObject.class);
query.setParameter("id", id);
query.setParameter("del", false);
return query.getResultList();
});
}
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/SandMiningAreaServiceImpl.java
......@@ -40,10 +40,7 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
@Override
public UUID addSandMiningArea(KObject kObject) {
UUID uuid = sandMiningAreaDao.create(kObject);
return uuid;
return sandMiningAreaDao.create(kObject);
}
private String getAreaWarningInfo(KObject kObject) {
......@@ -103,7 +100,7 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
HashMap<String, Object> whereMap = new HashMap<>(1);
whereMap.put("status",2);
whereMap.put("del",false);
List<KObject> kObjects = sandMiningAreaDao.ListByRegionalCompanyIds (regionalCompanyIds,isInclude);
List<KObject> kObjects = sandMiningAreaDao.listByRegionalCompanyIds (regionalCompanyIds,isInclude);
List<HashMap<String,Object>> regionalCompanyList = new ArrayList<>();
HashMap<String, Object> regionalCompany;
HashMap<String, Object> temp = new HashMap<>(12);
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/dao/PriceAdjustmentDao.java
......@@ -22,4 +22,6 @@ public interface PriceAdjustmentDao extends BaseDao {
UUID creteDetails(KObject insertDetailKobject);
Page<KObject> listPriceAdjustmentInfoPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity);
List<KObject> getNewByStationId(UUID id);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/entity/PriceAdjustmentSearchEntity.java
package com.xyst.dinas.price.entity;
import com.beecode.bap.attachment.common.Page;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
......@@ -13,9 +14,13 @@ public class PriceAdjustmentSearchEntity<T> extends Page<T> {
private Integer applyStatus;
private List<UUID> stationIds;
private List<UUID> regionalCompanyIds;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date adjustmentStartDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date adjustmentEndDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applyStartDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applyEndDate;
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java
......@@ -17,6 +17,7 @@ import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
......@@ -44,7 +45,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
if(null!=priceAdjustmentSearchEntity.getStationIds()){
if(!CollectionUtils.isEmpty(priceAdjustmentSearchEntity.getStationIds())){
detachedCriteria.add(Restrictions.in("station.id", priceAdjustmentSearchEntity.getStationIds()));
}
if(null!=priceAdjustmentSearchEntity.getAdjustmentStartDate()){
......@@ -59,7 +60,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
if(null!=priceAdjustmentSearchEntity.getApplyEndDate()){
detachedCriteria.add(Restrictions.le("applyDate", priceAdjustmentSearchEntity.getApplyEndDate()));
}
if(null!=priceAdjustmentSearchEntity.getRegionalCompanyIds()){
if(!CollectionUtils.isEmpty(priceAdjustmentSearchEntity.getRegionalCompanyIds())){
detachedCriteria.add(Restrictions.in("regionalCompany.id", priceAdjustmentSearchEntity.getRegionalCompanyIds()));
}
......@@ -75,6 +76,19 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
return priceAdjustmentSearchEntity;
}
@Override
public List<KObject> getNewByStationId(UUID id) {
KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
detachedCriteria.add(Restrictions.in("station.id", id));
detachedCriteria.add(Restrictions.eq("status",2 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
return byCriteria;
}
@Override
public void modify(KObject kobject) {
......@@ -94,8 +108,8 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
template.execute(session ->
{
Query query = session.createQuery("delete from " + PriceAdjustmentConstant.DETAIL_ENTITY +
" where master.id = :PriceAdjustmentId ");
query.setParameter("PriceAdjustmentId",priceAdjustmentId);
" as a where a.master.id = :priceAdjustmentId ");
query.setParameter("priceAdjustmentId",priceAdjustmentId);
return query.executeUpdate();
}
);
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java
......@@ -7,7 +7,10 @@ import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
import com.xyst.dinas.price.service.PriceAdjustmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Transactional(rollbackFor = Exception.class)
......@@ -25,6 +28,16 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
return priceAdjustmentDao.listPriceAdjustmentInfoPaging(priceAdjustmentSearchEntity);
}
@Override
public List<KObject> getNewByStations(List<UUID> ids) {
if(CollectionUtils.isEmpty(ids)){
return null;
}
List<KObject> kObjects = new ArrayList<>();
ids.forEach(id-> kObjects.addAll(priceAdjustmentDao.getNewByStationId(id)));
return kObjects;
}
@Override
public UUID addPriceAdjustment(KObject kObject) {
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/service/PriceAdjustmentService.java
......@@ -21,4 +21,5 @@ public interface PriceAdjustmentService {
Object queryByPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception;
List<KObject> getNewByStations(List<UUID> ids);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java
......@@ -9,6 +9,7 @@ import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.BaseConstants;
import com.beecode.util.DateUtil;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.service.DinasTypeService;
import com.xyst.dinas.price.constant.PriceAdjustmentConstant;
import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
import com.xyst.dinas.price.service.PriceAdjustmentService;
......@@ -29,16 +30,22 @@ public class PriceAdjustmentController {
@Autowired
private PriceAdjustmentService priceAdjustmentService;
@Autowired
private DinasTypeService dinasTypeService;
@RequestMapping(value = "/list/page", method = RequestMethod.GET)
public ResponseObj getListPage(@RequestBody PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception {
public ResponseObj getListPage(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception {
Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(priceAdjustmentSearchEntity.getPageNo());
objectPage.setPageSize(priceAdjustmentSearchEntity.getPageSize());
return ResponseObj.success("查询成功", priceAdjustmentService.queryByPaging(priceAdjustmentSearchEntity));
}
@RequestMapping(value = "/getDinasTypeByStationId", method = RequestMethod.GET)
public ResponseObj getDinasTypeByStationId(@RequestParam("stationId") UUID stationId) {
return ResponseObj.success("查询成功", dinasTypeService.getByStation(stationId));
}
/**
* 新建价格调整
*
......@@ -82,8 +89,22 @@ public class PriceAdjustmentController {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject PriceAdjustment = priceAdjustmentService.getById(id);
return ResponseObj.success("获取成功", PriceAdjustment);
KObject priceAdjustment = priceAdjustmentService.getById(id);
return ResponseObj.success("获取成功", priceAdjustment);
}
/**
* 获取最新的砂石价格
* @param ids id
* @return 获取成功
*/
@GetMapping("getNewByStations")
public ResponseObj getNewByStations(@RequestParam("ids") List<UUID> ids) {
if (ids == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
List<KObject> priceAdjustment = priceAdjustmentService.getNewByStations(ids);
return ResponseObj.success("获取成功", priceAdjustment);
}
......
backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment$DinasTypeDetails.jmx
......@@ -35,6 +35,14 @@
<m:description/>
<m:default/>
</m:attribute>
<m:attribute>
<m:id>9be72556-d8a4-4427-9cad-23504d5ce84a</m:id>
<m:name>dinasOldPrice</m:name>
<m:title>原价</m:title>
<m:type>fixnum</m:type>
<m:description/>
<m:default/>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
......
backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment.jmx
......@@ -74,6 +74,25 @@
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>385cd381-5e31-412e-9031-ecb4f4cd382a</m:id>
<m:name>reason</m:name>
<m:title>调价原因</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>e0e06e29-2285-4f78-88d8-e3e5b940ba45</m:id>
<m:name>failureReason</m:name>
<m:title>不通过原因</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
......
backend/xyst.dinas.price/src/main/resources/config/PriceAdjustment.hbm.xml
......@@ -66,6 +66,16 @@
<comment>申请状态 0待审批 1审批中 2通过 3不通过</comment>
</column>
</property>
<property name="failureReason" type="nstring" not-null="false">
<column name="failureReason">
<comment>不通过原因</comment>
</column>
</property>
<property name="reason" type="nstring" not-null="false">
<column name="reason">
<comment>调价原因</comment>
</column>
</property>
<bag name="dinasTypeDetails" lazy="true" fetch="select" inverse="true">
<key column="master_id" not-null="true" />
<one-to-many entity-name="com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails" />
......@@ -76,7 +86,6 @@
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="true">
<comment>砂石类型id</comment>
......@@ -92,5 +101,10 @@
<comment>砂石价格</comment>
</column>
</property>
<property name="dinasOldPrice" type="big_decimal" not-null="false">
<column name="dinas_old_price" precision="12" scale="4">
<comment>砂石原价</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/DischargingServiceImpl.java
......@@ -96,7 +96,7 @@ public class DischargingServiceImpl implements DischargingService {
UUID uuid = dischargingDao.create(kObject);
//生成预警消息的逻辑 如果是小于当前年份的记录,不生成预警
Boolean ltYear = DateTimeUtils.isLtNowYear(dischargingTime);
if (ltYear) {
if (!ltYear) {
setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea);
}
return uuid;
......@@ -181,7 +181,10 @@ public class DischargingServiceImpl implements DischargingService {
KObject oldSandMiningArea = id.get("sandMiningArea");
UUID oldSandMiningAreaId = oldSandMiningArea.getUuid("id");
setWarningRecord(oldSandMiningAreaId, oldDischargingTime, oldSandMiningArea);
//如果采区和年都没有变化,则不判断旧的数据是否结束
if(oldSandMiningAreaId!=sandMiningAreaId&&!DateTimeUtils.isSameYear(oldDischargingTime,dischargingTime)){
setWarningRecord(oldSandMiningAreaId, oldDischargingTime, oldSandMiningArea);
}
if(!DateTimeUtils.isLtNowYear(dischargingTime)){
setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea);
}
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/ProductionPlanReportServiceImpl.java
......@@ -20,6 +20,8 @@ import org.apache.commons.collections.CollectionUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
@Transactional(rollbackFor = Exception.class)
......@@ -188,7 +190,11 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
dinasTypeDetailJson.put("stationName",stationName);
dinasTypeDetailJson.put("dinasTypeId",dinasTypeDetail.get("dinasType").getUuid("id").toString());
dinasTypeDetailJson.put("dinasTypeName",dinasTypeDetail.get("dinasType").getString("dinasTypeName"));
dinasTypeDetailJson.put("amount",dinasTypeDetail.getDouble("dinasWeight"));
BigDecimal dinasWeight = dinasTypeDetail.getBigDecimal("dinasWeight");
if(0==dinasWeight.compareTo(BigDecimal.ZERO)){
continue;
}
dinasTypeDetailJson.put("amount",dinasWeight);
strings.add(dinasTypeDetailJson);
}
params.put("data",strings);
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/SalesConfiguration.java
......@@ -2,11 +2,16 @@ package com.xyst.dinas.sales.config;
import org.springframework.context.annotation.Bean;
import com.xyst.dinas.contract.internal.scene.ContractListDefaultScene;
import com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor;
import com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor;
import com.xyst.dinas.sales.dao.InventoryDao;
import com.xyst.dinas.sales.dao.NeedPlanDao;
import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.internal.dao.InventoryDaoImpl;
import com.xyst.dinas.sales.internal.dao.NeedPlanDaoImpl;
import com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor;
import com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor;
import com.xyst.dinas.sales.internal.service.InventoryServiceImpl;
import com.xyst.dinas.sales.internal.service.NeedPlanServiceImpl;
import com.xyst.dinas.sales.internal.service.SalesPlanServiceImpl;
......@@ -83,4 +88,13 @@ public class SalesConfiguration {
return new NeedPlanDaoImpl();
}
@Bean("com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor")
public SalesPerformWarningProcessor performWarningProcessor() {
return new SalesPerformWarningProcessor();
}
@Bean("com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor")
public SalesWarnSettingProcessor salesWarnSettingProcessor() {
return new SalesWarnSettingProcessor();
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/query/processor/SalesPerformWarningProcessor.java 0 → 100644
package com.xyst.dinas.sales.internal.query.processor;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.query.entity.RowData;
import com.beecode.inz.query.processor.DataProcessor;
import com.beecode.inz.query.processor.DataProcessorContext;
import com.xyst.dinas.biz.service.StationService;
import com.xyst.dinas.contract.service.ContractService;
public class SalesPerformWarningProcessor implements DataProcessor {
@Autowired
private StationService stationService;
@Override
public void process(DataProcessorContext context) {
List<RowData> rowDatas = context.getRowDatas();
for (RowData row : rowDatas) {
UUID stationId = UUID.fromString(row.get("billId").toString());
KObject station = stationService.getById(stationId);
row.put("stationName", station.getString("stationName"));
Assert.notNull(station, "找不到对应的场站!");
row.put("regionalCompanyName", station.get("regionalCompany").getString("name"));
}
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/query/processor/SalesWarnSettingProcessor.java 0 → 100644
package com.xyst.dinas.sales.internal.query.processor;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import com.beecode.bap.staff.service.StaffService;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.query.entity.RowData;
import com.beecode.inz.query.processor.DataProcessor;
import com.beecode.inz.query.processor.DataProcessorContext;
import com.xyst.dinas.biz.service.StationService;
import com.xyst.dinas.contract.service.ContractService;
/**
* 销售预警设置
*
*/
public class SalesWarnSettingProcessor implements DataProcessor {
@Autowired
private StationService stationService;
@Autowired
private StaffService staffService;
@Override
public void process(DataProcessorContext context) {
List<RowData> rowDatas = context.getRowDatas();
for (RowData row : rowDatas) {
//场站
UUID stationId = UUID.fromString(row.get("billId").toString());
KObject station = stationService.getById(stationId);
row.put("stationName", station.getString("stationName"));
Assert.notNull(station, "找不到对应的场站!");
String personnel = row.get("personnel") != null ? row.get("personnel").toString() : "";
String personnelName = "";
if (StringUtils.isNotEmpty(personnel)) {
List<String> personnelList = Arrays.asList(personnel.split(","));
for (int i = 0; i < personnelList.size(); i++) {
String personnelId = personnelList.get(i);
KObject personnelKObject = staffService.getById(UUID.fromString(personnelId));
if (i == personnelList.size() - 1) {
personnelName += personnelKObject.getString("name");
} else {
personnelName += personnelKObject.getString("name") + ",";
}
}
}
row.put("personnelName", personnelName);
}
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/InventoryServiceImpl.java
......@@ -138,7 +138,7 @@ public class InventoryServiceImpl implements InventoryService {
public void updateInventoryBaseInfo(UUID regionalCompany) {
List<StationDinasTypeRelation> relation = getStationAndDinasTypeRel(regionalCompany);
//根据最新的场站与砂石对应关系，更新库中的数据。添加新的砂石类型，废弃没用的砂石类型
//根据最新的区域公司与砂石对应关系，更新库中的数据。添加新的砂石类型，废弃没用的砂石类型
List<KObject> inventory = inventoryDao.listAllByRegionalCompany(regionalCompany, true);
for(StationDinasTypeRelation r : relation) {
UUID stationId = r.getStationId();
......@@ -192,8 +192,9 @@ public class InventoryServiceImpl implements InventoryService {
List<KObject> stationList;
try {
stationList = stationService.listStationInfoByRegionalCompany(regionalCompany);
//根据场站查砂石类型改成根据区域公司查砂石类型，默认每个场站都会卖这些砂石类型，把对应关系全部维护起来。
List<KObject> dinasTypeList = dinasTypeService.getByRegionalCompanyId(regionalCompany);
for(KObject station : stationList) {
List<KObject> dinasTypeList = dinasTypeService.getByStation(station.getUuid("id"));
//TODO：带出今日砂价
for(KObject dinasType : dinasTypeList) {
StationDinasTypeRelation item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesWarnSetting.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>SalesWarnSetting</name>
<title>销售预警设置</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='c0fb04e4-3ea7-4374-aa12-96614d7d0231'>
<kclass>com.xyst.dinas.biz.datamodel.WarnSetting</kclass>
<dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor</dataProcessor>
<innerScene title='全部'>
<id>5c728238-45ed-42b4-bc66-be4ecce84609</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>127aa3f5-1a4c-488b-9530-c890d5c8460b</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='version'>
<name>version</name>
<type>int</type>
<description></description>
</field>
<field title='业务id'>
<name>billId</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='业务类型'>
<name>billType</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='预警指标'>
<name>target</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='备注'>
<name>memo</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='实际值'>
<name>min</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='通知人员'>
<name>personnel</name>
<type>string</type>
<description></description>
</field>
<field title='创建时间'>
<name>createTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建人'>
<name>creator.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改时间'>
<name>modifyTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改人'>
<name>modifier.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesWarningExe.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>SalesWarningExe</name>
<title>执行预警</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='62ee19e3-374c-4954-bcb8-eab78f76dd1f'>
<kclass>com.xyst.dinas.biz.datamodel.WarningExe</kclass>
<dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor</dataProcessor>
<innerScene title='全部'>
<id>a9e6e14f-0f08-433f-a5d8-034dde8aee93</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>54a50515-f9e9-4f19-94db-d34424cf7f4b</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='开始时间'>
<name>startTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='结束时间'>
<name>endTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='业务id'>
<name>billId</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='预警指标'>
<name>target</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='备注'>
<name>memo</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='预警值'>
<name>min</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='实际值'>
<name>actualValue</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建时间'>
<name>createTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建人'>
<name>creator.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改时间'>
<name>modifyTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改人'>
<name>modifier.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesWarnSetting.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>c0fb04e4-3ea7-4374-aa12-96614d7d0231</id>
<name>com.xyst.dinas.sales.query.SalesWarnSetting</name>
<title>销售预警设置</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.WarnSetting</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.biz.datamodel.WarnSetting</m:type>
<m:dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>5c728238-45ed-42b4-bc66-be4ecce84609</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>127aa3f5-1a4c-488b-9530-c890d5c8460b</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>version</m:name>
<m:title>version</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>billId</m:name>
<m:title>业务id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>billType</m:name>
<m:title>业务类型</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>target</m:name>
<m:title>预警指标</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>memo</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>min</m:name>
<m:title>实际值</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>personnel</m:name>
<m:title>通知人员</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesWarningExe.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>62ee19e3-374c-4954-bcb8-eab78f76dd1f</id>
<name>com.xyst.dinas.sales.query.SalesWarningExe</name>
<title>销售预警</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.WarningExe</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.biz.datamodel.WarningExe</m:type>
<m:dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>a9e6e14f-0f08-433f-a5d8-034dde8aee93</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>54a50515-f9e9-4f19-94db-d34424cf7f4b</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>startTime</m:name>
<m:title>开始时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>endTime</m:name>
<m:title>结束时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>billId</m:name>
<m:title>业务id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>target</m:name>
<m:title>预警指标</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>memo</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>min</m:name>
<m:title>预警值</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>actualValue</m:name>
<m:title>实际值</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/datamodel/VehicleViolation.jmx
......@@ -9,10 +9,8 @@
<define-version>1.0</define-version>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<content>
<m:class>
......
backend/xyst.dinas.transport/src/main/resources/config/VehicleViolation.hbm.xml
......@@ -56,13 +56,13 @@
</column>
</property>
<property name="description" type="nstring" not-null="true">
<property name="description" type="nstring" not-null="false">
<column name="description" length="1000">
<comment>违规描述</comment>
</column>
</property>
<property name="processResult" type="nstring" not-null="true">
<property name="processResult" type="nstring" not-null="false">
<column name="process_result" length="1000">
<comment>违规处理结果</comment>
</column>
......
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