Skip to content

C
cloud-fb
Commit 55b2683c by 高晓磊
Options

运输公司备案元数据&调价申请验证重复

parent 01cfd3f7
Showing with 464 additions and 6 deletions
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/SandMiningAreaServiceImpl.java
......@@ -4,6 +4,7 @@ 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;
......@@ -87,6 +88,9 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
@Override
public void deleteById(UUID id) {
sandMiningAreaDao.deleteById(id);
WarnSetting warnSetting = warningSettingService.getWarnSetting(WarnSettingConstant.SAND_MINING_AREA_BILL_TYPE, id, WarnSettingConstant.SAND_MINING_AREA_WARN_TARGET);
warningSettingService.deleteWarnSetting(warnSetting.getSettingId());
warningSettingService.endWarnStateBySettingId(warnSetting.getSettingId());
}
@Override
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/dao/PriceAdjustmentDao.java
......@@ -24,4 +24,8 @@ public interface PriceAdjustmentDao extends BaseDao {
Page<KObject> listPriceAdjustmentInfoPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity);
List<KObject> getNewByStationId(UUID id);
List<KObject> getByStationId(UUID id);
List<KObject> getNewDetailsByStation(UUID id);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java
......@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.util.CollectionUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -34,6 +35,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
@Autowired
private DinasTypeDao dinasTypeDao;
@Override
public KObject load(UUID id) {
return (KObject) template.load(ENTITY, id);
......@@ -82,13 +84,40 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
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.add(Restrictions.eq("applyStatus",2 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
return byCriteria;
}
@Override
public List<KObject> getByStationId(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.in("applyStatus",1,3 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
return byCriteria;
}
@Override
public List<KObject> getNewDetailsByStation(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.in("applyStatus",1,3 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
if(CollectionUtils.isEmpty(byCriteria)){
return null;
}
return Arrays.asList(byCriteria.get(0).get("dinasTypeDetails").toArray());
}
@Override
public void modify(KObject kobject) {
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java
......@@ -38,6 +38,21 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
return kObjects;
}
@Override
public List<KObject> getNewDetailsByStation(UUID id) {
return priceAdjustmentDao.getNewDetailsByStation(id);
}
@Override
public KObject validateByStationId(UUID id) {
List<KObject> kObjects = priceAdjustmentDao.getByStationId(id);
if(CollectionUtils.isEmpty(kObjects)){
return null;
}
return kObjects.get(0);
}
@Override
public UUID addPriceAdjustment(KObject kObject) {
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/service/PriceAdjustmentService.java
package com.xyst.dinas.price.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -16,10 +13,15 @@ public interface PriceAdjustmentService {
KObject getById(UUID id);
void update(KObject kobject);
Object queryByPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception;
List<KObject> getNewByStations(List<UUID> ids);
List<KObject> getNewDetailsByStation(UUID id);
KObject validateByStationId(UUID id);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java
......@@ -94,6 +94,23 @@ public class PriceAdjustmentController {
}
/**
* 验证是否有最新审批中或者审批不通过的数据
*/
@GetMapping("validateByStationId")
public ResponseObj validateByStationId(@RequestParam("id") UUID id) {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject priceAdjustment = priceAdjustmentService.validateByStationId(id);
if(null!=priceAdjustment){
return ResponseObj.error("有正在审批或者未通过的数据,不可新建", priceAdjustment);
}
return ResponseObj.success("可以新增");
}
/**
* 获取最新的砂石价格
* @param ids id
* @return 获取成功
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportCompany$sequence.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/bcp-sequence">
<specification>1.0</specification>
<id>b87432ed-d086-4995-b9dc-3d604f00de66</id>
<name>com.xyst.dinas.transport.bill.TransportCompany$sequence</name>
<title>运输公司备案$sequence</title>
<description>运输公司备案</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportCompany$serial.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/bcp-serial">
<specification>1.0</specification>
<id>131a671d-1c01-4bd8-8f7e-b78af96adf5f</id>
<name>com.xyst.dinas.transport.bill.TransportCompany$serial</name>
<title>运输公司备案$serial</title>
<description>运输公司备案</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.transport.datamodel.TransportCompany</dependency>
<dependency>com.xyst.dinas.transport.bill.TransportCompany$sequence</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.transport.datamodel.TransportCompany</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>VV</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.transport.bill.TransportCompany$serial</m:key>
<m:sequenceName>com.xyst.dinas.transport.bill.TransportCompany$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportCompany.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/bcp-biztype">
<specification>1.0</specification>
<id>961d0f77-5b93-4962-aa6a-38771cb27807</id>
<name>com.xyst.dinas.transport.bill.TransportCompany</name>
<title>运输公司备案</title>
<description>运输公司备案</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.transport.bill.TransportCompany$serial</dependency>
<dependency>com.xyst.dinas.transport.datamodel.TransportCompany</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.transport.datamodel.TransportCompany</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.transport.bill.TransportCompany$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/datamodel/TransportCompany.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/bcp-type">
<specification>1.0</specification>
<id>e0e06e29-2285-4f78-88d8-e3e5b940ba45</id>
<name>com.xyst.dinas.transport.datamodel.TransportCompany</name>
<title>运输公司备案</title>
<description>运输公司备案</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<content>
<m:class>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:id>385cd381-5e31-412e-9031-ecb4f4cd382a</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>9be72556-d8a4-4427-9cad-23504d5ce84a</m:id>
<m:name>companyName</m:name>
<m:title>公司名称</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>d3286a16-0534-4d39-9657-ccd88ceb6e1d</m:id>
<m:name>businessLicense</m:name>
<m:title>营业执照</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>8e841e01-6f40-4052-ae19-49274828e3ec</m:id>
<m:name>linkMan</m:name>
<m:title>联系人</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>a505f0f9-a1f7-4669-8a72-0329b60173e0</m:id>
<m:name>contactDetails</m:name>
<m:title>联系方式</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/query/TransportCompany.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>152d05b0-01ee-4933-9a7c-8866894c118d</id>
<name>com.xyst.dinas.transport.query.TransportCompany</name>
<title>运输公司备案</title>
<description>运输公司备案</description>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.transport.datamodel.TransportCompany</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.transport.datamodel.TransportCompany</m:type>
<m:dataProcessor></m:dataProcessor>
<m:innerScenes>
<m:innerScene>
<m:id>b98f6ad2-cb60-4996-8ad3-80a637a27dea</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>ab5f4830-670a-4a24-b730-9c57a68fff13</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:innerScene>
<m:id>f9fff8dd-8bf5-47d1-8a94-d206b740677c</m:id>
<m:title>权限过滤</m:title>
<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
<m:defaultExecute>true</m:defaultExecute>
<m:hide>true</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<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>companyName</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>businessLicense</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>linkMan</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>contactDetails</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:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>del</m:name>
<m:title>删除</m:title>
<m:type>boolean</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/config/TransportCompany.hbm.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.transport.datamodel.TransportCompany" table="xyst_dinas_transport_company" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer" />
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"/>
</property>
<many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="creator_id" not-null="false"/>
</many-to-one>
<property name="modifyTime" type="timestamp" not-null="false">
<column name="modify_time"/>
</property>
<many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="modifier_id" not-null="false"/>
</many-to-one>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"/>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"/>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"/>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"/>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"/>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false">
<comment>所属组织机构</comment>
</column>
</many-to-one>
<property name="companyName" type="nstring" not-null="true">
<column name="company_name" length="13">
<comment>公司名称</comment>
</column>
</property>
<property name="businessLicense" type="nstring" not-null="false">
<column name="business_license" length="100">
<comment>营业执照</comment>
</column>
</property>
<property name="linkMan" type="nstring" not-null="false">
<column name="link_man" length="100">
<comment>联系人</comment>
</column>
</property>
<property name="contactDetails" type="nstring" not-null="false">
<column name="contact_details" length="100">
<comment>联系方式</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.transport/src/main/resources/config/VehicleViolation.hbm.xml
......@@ -51,7 +51,7 @@
</column>
</property>
<property name="plateNumber" type="nstring" not-null="true">
<column name="plateNumber" length="11">
<column name="plate_number" length="11">
<comment>车牌号</comment>
</column>
</property>
......
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