运输车辆违规记录&调价申请

backend/build.war/settings.gradle

@@ -17,6 +17,8 @@ includeBuild("../") {
 		substitute module('com.beecode:xyst.dinas.production') with project(':xyst.dinas.production')
 		substitute module('com.beecode:xyst.dinas.contract') with project(':xyst.dinas.contract')
 		substitute module('com.beecode:xyst.dinas.camera') with project(':xyst.dinas.camera')
+		substitute module('com.beecode:xyst.dinas.price') with project(':xyst.dinas.price')
+		substitute module('com.beecode:xyst.dinas.transport') with project(':xyst.dinas.transport')
 		substitute module('com.beecode:xyst.dinas.sales') with project(':xyst.dinas.sales')
 		substitute module('com.beecode:xyst.dinas.finance') with project(':xyst.dinas.finance')
 	}

backend/settings.gradle

@@ -15,6 +15,8 @@ include "xyst.dinas.project"
 include "xyst.dinas.production"
 include "xyst.dinas.contract"
 include "xyst.dinas.camera"
+include "xyst.dinas.price"
+include "xyst.dinas.transport"
 include "xyst.dinas.sales"
 include "xyst.dinas.finance"
 

backend/xyst.dinas.price/build.gradle

+dependencies {
+    compile lib.bcp_import
+    compile lib.bcp_type
+    compile lib.bcp_store
+    compile lib.hibernate_core
+    compile lib.spring_web
+    compile lib.spring_boot_autoconfigure
+    compile lib.jackson_datatype_jdk8
+    compile lib.jackson_datatype_jsr310
+    compile lib.json
+    compile "com.beecode:bap2.participant:${aminoVersion}"
+    compile "com.beecode:bcp.org:${aminoVersion}"
+    compile "com.beecode:bap2.department:${aminoVersion}"
+    compile "com.beecode:bap2.staff:${aminoVersion}"
+    compile 'com.deepoove:poi-tl:1.5.0'
+
+    compile project(":inz.common")
+    compile project(":inz.query")
+    compile project(":inz.workflow")
+    compile project(":inz.basis")
+    compile project(":inz.authentication")
+    compile project(":xyst.dinas.biz")
+    compile project(":xyst.dinas.production")
+    compile project(":xyst.dinas.project")
+
+
+    testCompile lib.amino_boot_web
+    testCompile lib.mysql_connector
+}
+

backend/xyst.dinas.price/settings.gradle

+rootProject.name = 'xyst.dinas.price'
\ No newline at end of file

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/config/PriceAdjustmentConfiguration.java

+package com.xyst.dinas.price.config;
+
+import com.beecode.amino.metadata.runtime.MetadataMech;
+import com.beecode.bcp.type.KClass;
+import com.beecode.bcp.type.TypeConstants;
+import com.xyst.dinas.price.constant.PriceAdjustmentConstant;
+import com.xyst.dinas.price.dao.PriceAdjustmentDao;
+import com.xyst.dinas.price.internal.dao.PriceAdjustmentDaoImpl;
+import com.xyst.dinas.price.internal.service.PriceAdjustmentServiceImpl;
+import com.xyst.dinas.price.service.PriceAdjustmentService;
+import com.xyst.dinas.price.web.PriceAdjustmentController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+
+
+/**
+ * @author scol
+ */
+public class PriceAdjustmentConfiguration {
+
+
+
+    @Autowired
+    @Qualifier(TypeConstants.CLASS_MECH)
+    private MetadataMech<KClass> typeMech;
+
+    @Bean(PriceAdjustmentConstant.ENTITY)
+    public KClass priceAdjustmentEntity() {
+        return typeMech.createStaticBeanByResource(
+                new ClassPathResource("/com/xyst/dinas/price/datamodel/PriceAdjustment.jmx", KClass.class));
+    }
+
+
+
+    //PriceAdjustmentDaoImpl相关bean配置
+    @Bean
+    public PriceAdjustmentDao priceAdjustmentDao() {
+        return new PriceAdjustmentDaoImpl();
+    }
+    @Bean
+    public PriceAdjustmentService priceAdjustmentService(){
+        return new PriceAdjustmentServiceImpl();
+    }
+
+    @Bean
+    public PriceAdjustmentController priceAdjustmentController(){
+        return new PriceAdjustmentController();
+    }
+
+
+
+}

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/constant/PriceAdjustmentConstant.java

+package com.xyst.dinas.price.constant;
+
+public interface PriceAdjustmentConstant {
+
+	/**
+	 * 实体名
+	 */
+	String ENTITY = "com.xyst.dinas.price.datamodel.PriceAdjustment";
+
+	/**
+	 * 子项目的实体名
+	 */
+	String DETAIL_ENTITY = "com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails";
+
+}

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/dao/PriceAdjustmentDao.java

+package com.xyst.dinas.price.dao;
+
+import com.beecode.bap.attachment.common.Page;
+import com.beecode.bcp.type.KObject;
+import com.beecode.inz.basis.dao.BaseDao;
+import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+public interface PriceAdjustmentDao extends BaseDao {
+
+    KObject load(UUID id);
+
+    UUID create(KObject kObject);
+
+    void modify(KObject kobject);
+
+    void deleteDetailByMasterId(UUID planReportId);
+
+    UUID creteDetails(KObject insertDetailKobject);
+
+    Page<KObject> listPriceAdjustmentInfoPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity);
+}

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 java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author scol
+ */
+public class PriceAdjustmentSearchEntity<T> extends Page<T> {
+    private Integer applyStatus;
+    private List<UUID> stationIds;
+    private List<UUID> regionalCompanyIds;
+    private Date adjustmentStartDate;
+    private Date adjustmentEndDate;
+    private Date applyStartDate;
+    private Date applyEndDate;
+
+
+    public Integer getApplyStatus() {
+        return applyStatus;
+    }
+
+    public void setApplyStatus(Integer applyStatus) {
+        this.applyStatus = applyStatus;
+    }
+
+    public List<UUID> getStationIds() {
+        return stationIds;
+    }
+
+    public void setStationIds(List<UUID> stationIds) {
+        this.stationIds = stationIds;
+    }
+
+    public List<UUID> getRegionalCompanyIds() {
+        return regionalCompanyIds;
+    }
+
+    public void setRegionalCompanyIds(List<UUID> regionalCompanyIds) {
+        this.regionalCompanyIds = regionalCompanyIds;
+    }
+
+    public Date getAdjustmentStartDate() {
+        return adjustmentStartDate;
+    }
+
+    public void setAdjustmentStartDate(Date adjustmentStartDate) {
+        this.adjustmentStartDate = adjustmentStartDate;
+    }
+
+    public Date getAdjustmentEndDate() {
+        return adjustmentEndDate;
+    }
+
+    public void setAdjustmentEndDate(Date adjustmentEndDate) {
+        this.adjustmentEndDate = adjustmentEndDate;
+    }
+
+    public Date getApplyStartDate() {
+        return applyStartDate;
+    }
+
+    public void setApplyStartDate(Date applyStartDate) {
+        this.applyStartDate = applyStartDate;
+    }
+
+    public Date getApplyEndDate() {
+        return applyEndDate;
+    }
+
+    public void setApplyEndDate(Date applyEndDate) {
+        this.applyEndDate = applyEndDate;
+    }
+}

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java

+package com.xyst.dinas.price.internal.dao;
+
+import com.beecode.amino.core.Amino;
+import com.beecode.bap.attachment.common.Page;
+import com.beecode.bcp.core.context.AminoContextHolder;
+import com.beecode.bcp.type.KClass;
+import com.beecode.bcp.type.KObject;
+import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
+import com.beecode.inz.common.BaseConstants;
+import com.xyst.dinas.biz.dao.DinasTypeDao;
+import com.xyst.dinas.price.constant.PriceAdjustmentConstant;
+import com.xyst.dinas.price.dao.PriceAdjustmentDao;
+import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
+import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.hibernate5.HibernateTemplate;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author scol
+ */
+public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdjustmentDao, PriceAdjustmentConstant {
+
+
+    @Autowired
+    private HibernateTemplate template;
+
+    @Autowired
+    private DinasTypeDao dinasTypeDao;
+	@Override
+	public KObject load(UUID id) {
+		return (KObject) template.load(ENTITY, id);
+	}
+
+
+    @Override
+    public Page<KObject> listPriceAdjustmentInfoPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) {
+        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()){
+            detachedCriteria.add(Restrictions.in("station.id", priceAdjustmentSearchEntity.getStationIds()));
+        }
+        if(null!=priceAdjustmentSearchEntity.getAdjustmentStartDate()){
+            detachedCriteria.add(Restrictions.ge("adjustmentDate", priceAdjustmentSearchEntity.getAdjustmentStartDate()));
+        }
+        if(null!=priceAdjustmentSearchEntity.getAdjustmentEndDate()){
+            detachedCriteria.add(Restrictions.le("adjustmentDate", priceAdjustmentSearchEntity.getAdjustmentEndDate()));
+        }
+        if(null!=priceAdjustmentSearchEntity.getApplyStartDate()){
+            detachedCriteria.add(Restrictions.ge("applyDate", priceAdjustmentSearchEntity.getApplyStartDate()));
+        }
+        if(null!=priceAdjustmentSearchEntity.getApplyEndDate()){
+            detachedCriteria.add(Restrictions.le("applyDate", priceAdjustmentSearchEntity.getApplyEndDate()));
+        }
+        if(null!=priceAdjustmentSearchEntity.getRegionalCompanyIds()){
+            detachedCriteria.add(Restrictions.in("regionalCompany.id", priceAdjustmentSearchEntity.getRegionalCompanyIds()));
+        }
+
+        if(null!=priceAdjustmentSearchEntity.getApplyStatus()){
+            detachedCriteria.add(Restrictions.in("applyStatus", priceAdjustmentSearchEntity.getApplyStatus()));
+        }
+
+        detachedCriteria.addOrder(Order.desc(BaseConstants.CREATE_TIME));
+        int offset = priceAdjustmentSearchEntity.getPageSize() * (priceAdjustmentSearchEntity.getPageNo() - 1);
+        priceAdjustmentSearchEntity.setTotal(template.findByCriteria(detachedCriteria).size());
+        List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria,offset,priceAdjustmentSearchEntity.getPageSize());
+        priceAdjustmentSearchEntity.setDatas(list);
+        return priceAdjustmentSearchEntity;
+    }
+
+
+    @Override
+    public void modify(KObject kobject) {
+        KObject id = load(kobject.getUuid("id"));
+        kobject.set(BaseConstants.CREATOR,id.get(BaseConstants.CREATOR));
+        kobject.set(BaseConstants.CREATE_TIME,id.getDate(BaseConstants.CREATE_TIME));
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
+        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFIER,staff);
+        kobject.set(BaseConstants.DEL,false);
+        template.merge(kobject);
+    }
+
+    @Override
+    public void deleteDetailByMasterId(UUID priceAdjustmentId) {
+        template.execute(session ->
+                {
+                    Query query = session.createQuery("delete from " + PriceAdjustmentConstant.DETAIL_ENTITY +
+                            " where master.id = :PriceAdjustmentId ");
+                    query.setParameter("PriceAdjustmentId",priceAdjustmentId);
+                    return query.executeUpdate();
+                }
+        );
+    }
+
+
+    @Override
+    public UUID creteDetails(KObject insertDetailKobject) {
+        insertDetailKobject.set("id",UUID.randomUUID());
+        return ((UUID)template.save(DETAIL_ENTITY,insertDetailKobject));
+    }
+
+
+    @Override
+    public UUID create(KObject kObject) {
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        if(null==kObject.getUuid("id")){
+            kObject.set("id",UUID.randomUUID());
+        }
+        kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
+        kObject.set(BaseConstants.CREATOR,staff);
+        kObject.set(BaseConstants.CREATE_TIME, new Date());
+        kObject.set("del",false);
+        return ((UUID)template.save(kObject));
+    }
+
+    /**
+     * 抽象方法，需要实现类提供HibernateTemplate
+     *
+     * @return HibernateTemplate
+     */
+    @Override
+    protected HibernateTemplate getHibernateTemplate() {
+        return template;
+    }
+
+    /**
+     * 抽象方法，需要实现类提供当前ModelName
+     *
+     * @return String
+     */
+    @Override
+    protected String getModelName() {
+        return PriceAdjustmentConstant.ENTITY;
+    }
+
+}

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java

+package com.xyst.dinas.price.internal.service;
+
+import com.beecode.bap.attachment.common.Page;
+import com.beecode.bcp.type.KObject;
+import com.xyst.dinas.price.dao.PriceAdjustmentDao;
+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 java.util.UUID;
+
+@Transactional(rollbackFor = Exception.class)
+public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
+
+	@Autowired
+	private PriceAdjustmentDao priceAdjustmentDao;
+
+
+    @Override
+    public Page<KObject> queryByPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception {
+        if(priceAdjustmentSearchEntity.getPageNo()==0||priceAdjustmentSearchEntity.getPageSize()==0) {
+            throw new Exception("pageSize or offset is null");
+        }
+        return priceAdjustmentDao.listPriceAdjustmentInfoPaging(priceAdjustmentSearchEntity);
+    }
+
+
+    @Override
+    public UUID addPriceAdjustment(KObject kObject) {
+        return priceAdjustmentDao.create(kObject);
+    }
+
+    @Override
+    public KObject getById(UUID id) {
+        return priceAdjustmentDao.load(id);
+    }
+
+
+    @Override
+    public void update(KObject kobject) {
+
+      priceAdjustmentDao.modify(kobject);
+    }
+
+
+
+    private void deleteDetailByMasterId(UUID stationId) {
+        priceAdjustmentDao.deleteDetailByMasterId(stationId);
+    }
+
+
+}

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;
+
+public interface PriceAdjustmentService {
+
+
+    UUID addPriceAdjustment(KObject kObject);
+
+    KObject getById(UUID id);
+
+
+    void update(KObject kobject);
+
+    Object queryByPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception;
+
+}

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java

+package com.xyst.dinas.price.web;
+
+import com.beecode.amino.core.Amino;
+import com.beecode.bap.attachment.common.Page;
+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.inz.common.BaseConstants;
+import com.beecode.util.DateUtil;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.xyst.dinas.price.constant.PriceAdjustmentConstant;
+import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
+import com.xyst.dinas.price.service.PriceAdjustmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author scol
+ */
+@RestController()
+
+public class PriceAdjustmentController {
+
+    @Autowired
+    private PriceAdjustmentService priceAdjustmentService;
+
+    @RequestMapping(value = "list/page", method = RequestMethod.GET)
+    public ResponseObj getListPage(@RequestBody PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception {
+
+        Page<KObject> objectPage = new Page<>();
+        objectPage.setPageNo(priceAdjustmentSearchEntity.getPageNo());
+        objectPage.setPageSize(priceAdjustmentSearchEntity.getPageSize());
+        return ResponseObj.success("查询成功", priceAdjustmentService.queryByPaging(priceAdjustmentSearchEntity));
+    }
+
+    /**
+     * 新建价格调整
+     *
+     * @param body json
+     * @return ResponseObj
+     */
+    @PostMapping
+    public ResponseObj create(@RequestBody String body) {
+        KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class));
+
+        if (kobject.getUuid(BaseConstants.ID) == null) {
+            return ResponseObj.error(400, "'id' must be not null!");
+        }
+        UUID id = priceAdjustmentService.addPriceAdjustment(kobject);
+        return ResponseObj.success("保存成功", id);
+    }
+
+
+    /**
+     * 修改价格调整
+     *
+     * @param body 价格调整json
+     * @return 修改成功
+     */
+    @PutMapping
+    public ResponseObj update(@RequestBody String body) {
+        KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class));
+        priceAdjustmentService.update(kobject);
+        return ResponseObj.success("修改成功");
+    }
+
+
+    /**
+     * 根据id获取价格调整
+     *
+     * @param id id
+     * @return 获取成功
+     */
+    @GetMapping("/{id}")
+    public ResponseObj getById(@PathVariable("id") UUID id) {
+        if (id == null) {
+            return ResponseObj.error(400, "'id' must be not null!");
+        }
+        KObject PriceAdjustment = priceAdjustmentService.getById(id);
+        return ResponseObj.success("获取成功", PriceAdjustment);
+    }
+
+
+}
\ No newline at end of file

backend/xyst.dinas.price/src/main/resources/META-INF/spring.factories

+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.xyst.dinas.price.config.PriceAdjustmentConfiguration

backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/bill/PriceAdjustment$sequence.jmx

+<?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>bed6afad-7848-3cb4-a288-11c5f1205ae5</id>
+	<name>com.xyst.dinas.price.bill.PriceAdjustment$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.price/src/main/resources/com/xyst/dinas/price/bill/PriceAdjustment$serial.jmx

+<?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>b34f3ded-3664-369b-a146-97be4b24cde1</id>
+	<name>com.xyst.dinas.price.bill.PriceAdjustment$serial</name>
+	<title>计划上报$serial</title>
+	<description>计划上报</description>
+	<define>bcp.serial</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.price.datamodel.PriceAdjustment</dependency>
+	<dependency>com.xyst.dinas.price.bill.PriceAdjustment$sequence</dependency>
+	<content>
+		<m:serial>
+			<m:input>com.xyst.dinas.price.datamodel.PriceAdjustment</m:input>
+			<m:functionLibrarys/>
+			<m:segments>
+				<m:literal>
+					<m:value>PA</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.price.bill.PriceAdjustment$serial</m:key>
+					<m:sequenceName>com.xyst.dinas.price.bill.PriceAdjustment$sequence</m:sequenceName>
+				</m:sequence>
+			</m:segments>
+		</m:serial>
+	</content>
+</metadata>

backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/bill/PriceAdjustment.jmx

+<?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>44b52473-d2df-3c5e-8d22-60b52f9e5c49</id>
+	<name>com.xyst.dinas.price.bill.PriceAdjustment</name>
+	<title>计划上报</title>
+	<description>计划上报</description>
+	<define>bcp.biz.Biztype</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.price.bill.PriceAdjustment$serial</dependency>
+	<dependency>com.xyst.dinas.price.datamodel.PriceAdjustment</dependency>
+	<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
+	<content>
+		<m:biztype>
+			<m:type>com.xyst.dinas.price.datamodel.PriceAdjustment</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.price.bill.PriceAdjustment$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.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment$DinasTypeDetails.jmx

+<?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>cf735008-b2cc-40e3-b2db-843d19b873d1</id>
+	<name>com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails</name>
+	<title>调价申请子表</title>
+	<description>调价申请采砂类型和砂石价格子表</description>
+	<define>bcp.type.Class</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
+    <dependency>com.xyst.dinas.price.datamodel.PriceAdjustment</dependency>
+	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
+    <dependency>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</dependency>
+    <dependency>bcp.type.json.JsonIgnore</dependency>
+	<content>
+    		<m:class>
+    			<m:parents>
+    				<m:parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</m:parent>
+    			</m:parents>
+    			<m:attributes>
+    				<m:attribute>
+    					<m:annotations/>
+    					<m:id>247a0284-b15d-4872-b9fa-2a37b8ec3e88</m:id>
+    					<m:name>dinasType</m:name>
+    					<m:title>砂石类型</m:title>
+    					<m:type>com.xyst.dinas.biz.datamodel.DinasType</m:type>
+    					<m:description></m:description>
+    					<m:default></m:default>
+    				</m:attribute>
+				<m:attribute>
+					<m:id>aa48aba2-e9db-48c9-be1a-f32d75470da5</m:id>
+					<m:name>dinasPrice</m:name>
+					<m:title>价格</m:title>
+					<m:type>fixnum</m:type>
+					<m:description/>
+					<m:default/>
+				</m:attribute>
+    				<m:attribute>
+    					<m:annotations>
+    						<m:annotation>
+    							<m:type>bcp.type.json.JsonIgnore</m:type>
+    						</m:annotation>
+    					</m:annotations>
+    					<m:id>0f03ad12-3195-4696-b2c7-001e3aae8dc5</m:id>
+    					<m:name>master</m:name>
+    					<m:title>调价申请表</m:title>
+    					<m:type>com.xyst.dinas.price.datamodel.PriceAdjustment</m:type>
+    					<m:description></m:description>
+    					<m:default></m:default>
+    				</m:attribute>
+    			</m:attributes>
+    		</m:class>
+    	</content>
+</metadata>

backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment.jmx

+<?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>1c862289-0e4f-4fee-9194-6047b3b87174</id>
+	<name>com.xyst.dinas.price.datamodel.PriceAdjustment</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.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>
+			<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>1c862289-0e4f-4fee-9194-6047b3b87174</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:annotations/>
+                    <m:id>037b2fd4-f140-4389-9fd0-0b0dad9fe59c</m:id>
+                    <m:name>station</m:name>
+                    <m:title>所属场站</m:title>
+                    <m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
+                    <m:description></m:description>
+                    <m:default></m:default>
+                </m:attribute>
+				<m:attribute>
+					<m:annotations>
+                        <m:annotation>
+                            <m:type>bcp.type.constraint.NotNull</m:type>
+                        </m:annotation>
+					</m:annotations>
+					<m:id>088ab1d7-0926-46cb-b68e-79772d0b4f46</m:id>
+					<m:name>adjustmentDate</m:name>
+					<m:title>调整时间</m:title>
+					<m:type>datetime</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+                        <m:annotation>
+                            <m:type>bcp.type.constraint.NotNull</m:type>
+                        </m:annotation>
+					</m:annotations>
+					<m:id>b6bfdbde-214c-4576-85dc-a3fa493426d3</m:id>
+					<m:name>applyDate</m:name>
+					<m:title>申请时间</m:title>
+					<m:type>datetime</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+                <m:attribute>
+					<m:annotations/>
+					<m:id>c1e3811b-9c1b-447e-9e80-2f46385b4e8a</m:id>
+					<m:name>applyStatus</m:name>
+					<m:title>申请状态</m:title>
+					<m:type>int</m:type>
+					<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>862d0182-3296-4481-a1d9-6b0c6fe91aa4</m:id>
+					<m:name>dinasTypeDetails</m:name>
+					<m:title>包含砂石种类和砂石价格子表</m:title>
+					<m:type>com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails[]</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+			</m:attributes>
+		</m:class>
+	</content>
+</metadata>

backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/query/PriceAdjustment.jmx

+<?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>dd168826-fb2e-45a2-ba98-2f317e1684ed</id>
+	<name>com.xyst.dinas.price.query.PriceAdjustment</name>
+	<title>调价申请</title>
+	<description>调价申请</description>
+	<define>inz.query.Query</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
+	<content>
+		<m:query>
+			<m:type>com.xyst.dinas.price.datamodel.PriceAdjustment</m:type>
+			<m:dataProcessor/>
+			<m:authorityItem/>
+			<m:innerScenes>
+				<m:innerScene>
+					<m:id>2093fbb7-e3b6-458d-b6f3-37bbaa61a896</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>0eea20cd-9577-4d96-8d06-219663f34af8</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>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>区域公司名称</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>station.id</m:name>
+					<m:title>场站id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>station.name</m:name>
+					<m:title>场站名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Station</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: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</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>sandMiningArea.id</m:name>
+					<m:title>采砂区域</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.SandMiningArea</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+                    <m:name>adjustmentDate</m:name>
+                    <m:title>调整时间</m:title>
+                    <m:type>datetime</m:type>
+                    <m:ref>
+                        <m:name></m:name>
+                        <m:type></m:type>
+                    </m:ref>
+				</m:field>
+				<m:field>
+					<m:name>sandMiningArea.sandMiningAreaType</m:name>
+					<m:title>采砂区域类型</m:title>
+					<m:type>int</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.SandMiningArea</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>permitCode</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>miningNature</m:name>
+					<m:title>开采性质</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>sandMiningStart</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>sandMiningEnd</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>workStartTime</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>workEndTime</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>miningVolume</m:name>
+					<m:title>开采量</m:title>
+					<m:type>fixnum</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>miningDepth</m:name>
+					<m:title>开采深度</m:title>
+					<m:type>fixnum</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>sandMiningRange</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>ship.id</m:name>
+					<m:title>船</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>ship.shipName</m:name>
+					<m:title>船名</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>ship.shipCodeNum</m:name>
+					<m:title>船号</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>sandMiningPower</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>workMethod</m:name>
+					<m:title>作业方式</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>status</m:name>
+					<m:title>许可证状态</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>shipOwner</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>workUser</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>reason</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>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.price/src/main/resources/config/PriceAdjustment.hbm.xml

+<?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.price.datamodel.PriceAdjustment" table="xyst_dinas_price_adjustment" 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>
+        <many-to-one name="station" entity-name="com.xyst.dinas.biz.datamodel.Station" fetch="select">
+            <column name="station_id"  not-null="false">
+                <comment>所属场站</comment>
+            </column>
+        </many-to-one>
+        <property name="adjustmentDate" type="timestamp" not-null="true">
+            <column name="adjustment_date">
+                <comment>调整时间</comment>
+            </column>
+        </property>
+        <property name="applyDate" type="timestamp" not-null="true">
+            <column name="apply_date">
+                <comment>申请时间</comment>
+            </column>
+        </property>
+
+        <property name="applyStatus" type="int" not-null="true">
+            <column name="apply_status">
+                <comment>申请状态 0待审批 1审批中 2通过 3不通过</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" />
+        </bag>
+    </class>
+    <class entity-name="com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails" table="xyst_dinas_price_adjustment_dinas_type_detail" >
+        <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>
+
+        <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>
+            </column>
+        </many-to-one>
+        <many-to-one name="master" entity-name="com.xyst.dinas.price.datamodel.PriceAdjustment" fetch="select">
+            <column name="master_id" not-null="true">
+                <comment>所属价格申请</comment>
+            </column>
+        </many-to-one>
+        <property name="dinasPrice" type="big_decimal" not-null="false">
+            <column name="dinas_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/dao/ProductionPlanReportDaoImpl.java

@@ -61,8 +61,9 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
 
         detachedCriteria.addOrder(Order.desc(BaseConstants.CREATE_TIME));
         int offset = page.getPageSize() * (page.getPageNo() - 1);
-        page.setTotal(template.findByCriteria(detachedCriteria).size());
         List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria,offset,page.getPageSize());
+        Long totalCount = (Long) detachedCriteria.setProjection(Projections.rowCount()).getExecutableCriteria(template.getSessionFactory().getCurrentSession()).uniqueResult();
+        page.setTotal(Math.toIntExact(totalCount));
         page.setDatas(list);
         return page;
     }
@@ -114,7 +115,7 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
         template.execute(session ->
                 {
                     Query query = session.createQuery("delete from " + ProductionPlanReportConstant.DETAIL_ENTITY +
-                            " where master.id = :planReportId ");
+                            " as a where a.master.id = :planReportId ");
                     query.setParameter("planReportId",planReportId);
                     return query.executeUpdate();
                 }
@@ -160,14 +161,14 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
     @Override
     public UUID create(KObject kObject) {
         KObject staff = AminoContextHolder.getContext().getStaff();
-        if(null==kObject.getUuid("id")){
-            kObject.set("id",UUID.randomUUID());
+        if(null==kObject.getUuid(BaseConstants.ID)){
+            kObject.set(BaseConstants.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);
+        kObject.set(BaseConstants.DEL,false);
         return ((UUID)template.save(kObject));
     }
 
@@ -175,9 +176,9 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",true);
+        kobject.set(BaseConstants.DEL,true);
         template.update(kobject);
     }
 

backend/xyst.dinas.transport/build.gradle

+dependencies {
+    compile lib.bcp_import
+    compile lib.bcp_type
+    compile lib.bcp_store
+    compile lib.hibernate_core
+    compile lib.spring_web
+    compile lib.spring_boot_autoconfigure
+    compile lib.jackson_datatype_jdk8
+    compile lib.jackson_datatype_jsr310
+    compile lib.json
+    compile "com.beecode:bap2.participant:${aminoVersion}"
+    compile "com.beecode:bcp.org:${aminoVersion}"
+    compile "com.beecode:bap2.department:${aminoVersion}"
+    compile "com.beecode:bap2.staff:${aminoVersion}"
+    compile 'com.deepoove:poi-tl:1.5.0'
+
+    compile project(":inz.common")
+    compile project(":inz.query")
+    compile project(":inz.workflow")
+    compile project(":inz.basis")
+    compile project(":inz.authentication")
+    compile project(":xyst.dinas.biz")
+    compile project(":xyst.dinas.production")
+    compile project(":xyst.dinas.project")
+
+
+    testCompile lib.amino_boot_web
+    testCompile lib.mysql_connector
+}
+

backend/xyst.dinas.transport/settings.gradle

+rootProject.name = 'xyst.dinas.transport'
\ No newline at end of file

backend/xyst.dinas.transport/src/main/resources/META-INF/spring.factories

+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleViolation$sequence.jmx

+<?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>ffe4f0d5-377d-4a73-8e39-b344fe524f83</id>
+	<name>com.xyst.dinas.transport.bill.VehicleViolation$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/VehicleViolation$serial.jmx

+<?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>c3a59b7d-ee72-4e8e-a961-441ab4a07055</id>
+	<name>com.xyst.dinas.transport.bill.VehicleViolation$serial</name>
+	<title>车辆违规记录$serial</title>
+	<description>车辆违规记录</description>
+	<define>bcp.serial</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.transport.datamodel.VehicleViolation</dependency>
+	<dependency>com.xyst.dinas.transport.bill.VehicleViolation$sequence</dependency>
+	<content>
+		<m:serial>
+			<m:input>com.xyst.dinas.transport.datamodel.VehicleViolation</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.VehicleViolation$serial</m:key>
+					<m:sequenceName>com.xyst.dinas.transport.bill.VehicleViolation$sequence</m:sequenceName>
+				</m:sequence>
+			</m:segments>
+		</m:serial>
+	</content>
+</metadata>

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleViolation.jmx

+<?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>774f9ed5-866c-4223-b327-d576ec2c6ba1</id>
+	<name>com.xyst.dinas.transport.bill.VehicleViolation</name>
+	<title>车辆违规记录</title>
+	<description>车辆违规记录</description>
+	<define>bcp.biz.Biztype</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.transport.bill.VehicleViolation$serial</dependency>
+	<dependency>com.xyst.dinas.transport.datamodel.VehicleViolation</dependency>
+	<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
+	<content>
+		<m:biztype>
+			<m:type>com.xyst.dinas.transport.datamodel.VehicleViolation</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.VehicleViolation$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/VehicleViolation.jmx

+<?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>4ca2a466-ec14-41ce-8097-ff85cb88b074</id>
+	<name>com.xyst.dinas.transport.datamodel.VehicleViolation</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.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>
+			<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>188ade98-7b28-4756-a371-3081693f483f</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:annotations>
+                        <m:annotation>
+                            <m:type>bcp.type.constraint.NotNull</m:type>
+                        </m:annotation>
+					</m:annotations>
+					<m:id>49040e70-a146-49ea-b2d9-d05a594df397</m:id>
+					<m:name>plateNumber</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:annotation>
+                            <m:type>bcp.type.constraint.NotNull</m:type>
+                        </m:annotation>
+					</m:annotations>
+					<m:id>49040e70-a146-49ea-b2d9-d05a594df397</m:id>
+					<m:name>violationDate</m:name>
+					<m:title>违规时间</m:title>
+					<m:type>datetime</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+
+				<m:attribute>
+					<m:id>23912ef1-b7c5-4a49-9005-a1097a147c70</m:id>
+					<m:name>description</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>5086b398-2d3f-4ccf-bcd7-a4e09ccab7dc</m:id>
+					<m:name>processResult</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/VehicleViolation.jmx

+<?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>450c11da-0503-4daa-a17b-84f12e91f198</id>
+	<name>com.xyst.dinas.transport.query.VehicleViolation</name>
+	<title>违规记录查询</title>
+	<description>违规记录查询</description>
+	<define>inz.query.Query</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.transport.datamodel.VehicleViolation</dependency>
+	<content>
+		<m:query>
+			<m:type>com.xyst.dinas.transport.datamodel.VehicleViolation</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>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>plateNumber</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>description</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>processResult</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>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>violationDate</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>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:fields>
+		</m:query>
+	</content>
+</metadata>

backend/xyst.dinas.transport/src/main/resources/config/VehicleViolation.hbm.xml

+<?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.VehicleViolation" table="xyst_dinas_transport_vehicle_violation" 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="violationDate" type="timestamp" not-null="true">
+            <column name="violation_date">
+                <comment>违规时间</comment>
+            </column>
+        </property>
+        <property name="description" type="nstring" not-null="true">
+            <column name="description" length="1000">
+                <comment>违规描述</comment>
+            </column>
+        </property>
+
+        <property name="processResult" type="nstring" not-null="true">
+            <column name="process_result" length="1000">
+                <comment>违规处理结果</comment>
+            </column>
+        </property>
+    </class>
+</hibernate-mapping>
\ No newline at end of file