Skip to content

C
cloud-fb
Commit 87745197 by yanHeng
Options

Merge branch 'feature/vehicle-amount-party' into feature/sales_management 

# Conflicts:
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$sequence.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$serial.jmx
#	backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
#	backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$sequence.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$serial.jmx
#	backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
#	backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$sequence.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$serial.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$sequence.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$serial.jmx
#	backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$sequence.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation$serial.jmx
#	backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/VehicleViolation.jmx
#	backend/xyst.dinas.sales/src/main/resources/META-INF/spring.factories
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$sequence.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$serial.jmx
#	backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.jmx
#	backend/xyst.dinas.sales/src/main/resources/config/CoefficientOrPrice.hbm.xml
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$sequence.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord$serial.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportRecord.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$sequence.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$serial.jmx
#	backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch.jmx
parents ebde4601 38b002e8
Showing with 1227 additions and 100 deletions
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -540,6 +540,19 @@
<m:icon>iconfont iconkucunchaxun1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>26783a66-bf30-42d5-af91-1aa7fcab1654</m:id>
<m:name>vehicle_amount_party</m:name>
<m:title>车辆量方</m:title>
<m:index>1400</m:index>
<m:license></m:license>
<m:privilege>com.xyst.dinas.sales.auth.VehicleAmountPartyList</m:privilege>
<m:function-definition>
<m:view>function-vehicle-amount-party</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont iconcheliangliangfang1x</m:icon>
</m:function-node>
<m:function-node>
<m:id>e536e311-8d22-4730-b3d7-444fd718c883</m:id>
<m:name>self_pickup_car</m:name>
<m:title>自提车辆</m:title>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$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>fd5a8cb8-e24d-45c2-b5c4-8f80cde3fda6</id>
<id>133d847a-a8aa-4c11-a2e9-3b110e60b05e</id>
<name>com.xyst.dinas.biz.bill.DinasType$sequence</name>
<title>砂石类型$sequence</title>
<description>砂石类型</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType$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>4dfb510e-962b-43db-8ab6-ed02c7fcfd9b</id>
<id>26416f69-5aac-41fd-aed3-c6244c13c7b3</id>
<name>com.xyst.dinas.biz.bill.DinasType$serial</name>
<title>砂石类型$serial</title>
<description>砂石类型</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/DinasType.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>d9af8a12-b914-41da-a09e-a06206ad9b0f</id>
<id>5cdcd025-db60-44dd-8409-07ff415b69c1</id>
<name>com.xyst.dinas.biz.bill.DinasType</name>
<title>砂石类型</title>
<description>砂石类型</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$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>33a2f931-947d-4646-9e5c-1ba9f7ac4a6d</id>
<id>9b5deb8a-ed9d-422b-a5e3-7c1a654e658e</id>
<name>com.xyst.dinas.biz.bill.Position$sequence</name>
<title>岗位$sequence</title>
<description>岗位</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$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>338a0901-0bfc-458c-9b7e-6fe54b586cab</id>
<id>5625756c-93c7-4bbe-8c26-5c401ae99de4</id>
<name>com.xyst.dinas.biz.bill.Position$serial</name>
<title>岗位$serial</title>
<description>岗位</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.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>98daef45-24df-4763-8ac6-4147c2df7400</id>
<id>090d9c40-c59d-45eb-91e9-48339822c625</id>
<name>com.xyst.dinas.biz.bill.Position</name>
<title>岗位</title>
<description>岗位</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$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>f1d80085-b4e8-4817-918f-2bfbb88ec02a</id>
<id>9ee1f1a2-97fe-4700-83cb-0f60eb147913</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$sequence</name>
<title>船舶备案$sequence</title>
<description>船舶备案</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$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>cc8cdcd9-ddae-4c51-8671-53dde5a17be2</id>
<id>bde53115-1ebc-40c7-8e92-19f40a6b8d88</id>
<name>com.xyst.dinas.biz.bill.ShipInfo$serial</name>
<title>船舶备案$serial</title>
<description>船舶备案</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.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>15ad83cf-71f2-4bcb-9771-586f78825681</id>
<id>01cbb80e-1e00-481c-ad2d-4d29b110f6e6</id>
<name>com.xyst.dinas.biz.bill.ShipInfo</name>
<title>船舶备案</title>
<description>船舶备案</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$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>8f4c0e93-acfc-44cc-b99d-ca7736f42d9d</id>
<id>869709ca-afd7-4c48-bd0f-f7d6ffccfc44</id>
<name>com.xyst.dinas.biz.bill.Station$sequence</name>
<title>场站$sequence</title>
<description>场站</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$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>01a03150-42ce-4439-8e44-1bca18be2917</id>
<id>c93c1c1b-0053-44cc-97aa-073f02980a5a</id>
<name>com.xyst.dinas.biz.bill.Station$serial</name>
<title>场站$serial</title>
<description>场站</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.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>b9f47fec-c5f8-429e-9b49-a7648ef59352</id>
<id>5e5ab116-de90-4417-9cf2-f5979a5054ab</id>
<name>com.xyst.dinas.biz.bill.Station</name>
<title>场站</title>
<description>场站</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$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>e935baf0-1daf-46e8-a540-ff1a39e74c0f</id>
<id>44e338dc-51f3-4604-b0bb-a64b128caa54</id>
<name>com.xyst.dinas.biz.bill.xystOrganization$sequence</name>
<title>组织机构$sequence</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization$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>5476eee3-8b8c-4d6e-b73d-ecd7ecc487a7</id>
<id>1c7a215f-18a0-4f9e-8e93-6026ba2ab3bf</id>
<name>com.xyst.dinas.biz.bill.xystOrganization$serial</name>
<title>组织机构$serial</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/xystOrganization.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>e0af541a-098f-493c-9161-7e3fbed50960</id>
<id>43140ee9-bdea-4471-b3e8-91514434110b</id>
<name>com.xyst.dinas.biz.bill.xystOrganization</name>
<title>组织机构</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/xystOrganization.jmx
......@@ -101,16 +101,6 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>generateSalePlanTime</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>
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java
......@@ -348,4 +348,21 @@ public class ContractDao {
});
}
/**
* @Author yanHeng
* @Date 2022/4/7 18:15
* @Param [contract, amount] 合同,扣减总价
* @return java.lang.Boolean
**/
public Boolean updateContractAdvanceBalance(KObject contract, BigDecimal amount) {
boolean flag = false;
BigDecimal advanceBalance;
if(null != amount){
advanceBalance = new BigDecimal(contract.getDouble(ContractConstant.ADVANCE_BALANCE));
contract.set(ContractConstant.ADVANCE_BALANCE, advanceBalance.subtract(amount));
update(contract);
flag = true;
}
return flag;
}
}
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$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>c7d7832a-617a-4328-909c-1a6ae05887b7</id>
<id>e2a19cdb-6124-4c78-9935-bea0b5eb1241</id>
<name>com.xyst.dinas.contract.bill.ContractBill$sequence</name>
<title>合同单据$sequence</title>
<description>合同单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$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>07729f04-2bd3-42ec-aabc-105575ed430f</id>
<id>5f28e1fe-7c9f-4b26-9aa4-2ba9331e3966</id>
<name>com.xyst.dinas.contract.bill.ContractBill$serial</name>
<title>合同单据$serial</title>
<description>合同单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.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>c0cacc99-7e3c-44f1-b63e-6d67944fd45b</id>
<id>749d689e-027a-42ac-82bc-0f9efad3a22b</id>
<name>com.xyst.dinas.contract.bill.ContractBill</name>
<title>合同单据</title>
<description>合同单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill$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>4e0d5546-fda2-4c83-ba4c-91d784f4e98b</id>
<id>2090943b-01c5-4c56-9913-ed136cd2485c</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill$sequence</name>
<title>自提车辆单据$sequence</title>
<description>自提车辆单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill$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>adb7369d-2957-421c-b172-b00bd16150db</id>
<id>348d6482-db4c-4c3a-b2fc-c66dada7fd89</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill$serial</name>
<title>自提车辆单据$serial</title>
<description>自提车辆单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/SelfPickupCarBill.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>536cdb2b-49be-46db-99c7-0aadb41077fc</id>
<id>e52eed8c-aa1e-4070-8163-f6101f29b786</id>
<name>com.xyst.dinas.contract.bill.SelfPickupCarBill</name>
<title>自提车辆单据</title>
<description>自提车辆单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/ContractAssociatedcontractDetail.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>16eb1d1b-2b4f-4c28-93dc-39c30de9a072</id>
<id>e721e1da-726b-4c8a-b0f2-48851ca4d235</id>
<name>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</name>
<title>合同子表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/SelfPickupCar.jmx
......@@ -7,22 +7,59 @@
<description>自提车辆表</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Entity</dependency>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>javax.persistence.ManyToOne</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>javax.persistence.JoinColumn</dependency>
<dependency>javax.persistence.OneToMany</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.project.datamodel.PurchaseSandCompany</dependency>
<dependency>javax.persistence.Column</dependency>
<dependency>javax.persistence.Table</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract</dependency>
<content>
<m:class>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Entity</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Table</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>xyst_dinas_contract_self_pickup_car</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<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:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>project_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>fbfd1335-5f18-4bd3-98ca-2c63afe97827</m:id>
<m:name>project</m:name>
<m:title>项目</m:title>
......@@ -36,6 +73,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>project_code</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>9ea6f374-f043-45d1-ab78-64d4b1ed7a05</m:id>
<m:name>projectCode</m:name>
......@@ -45,7 +91,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>f6b523af-1eeb-4c3b-b644-c51866087f60</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
......@@ -59,6 +122,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>regional_company_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>afc7f528-d6d1-491d-b867-e4824a8513c3</m:id>
<m:name>regionalCompanyName</m:name>
......@@ -68,7 +140,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>purchase_sand_Unit_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b201aec2-36b7-4dda-880d-36dcc6173796</m:id>
<m:name>purchaseSandUnit</m:name>
<m:title>购砂单位</m:title>
......@@ -82,6 +171,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>purchase_sand_Unit_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>694805bd-715a-4a5c-9b90-6f4400ef39f1</m:id>
<m:name>purchaseSandUnitName</m:name>
......@@ -91,7 +189,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.ManyToOne</m:type>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.JoinColumn</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_id</m:value>
</m:property>
<m:property>
<m:key>referencedColumnName</m:key>
<m:value>ID</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a518f765-df1d-4670-a423-5c896149548e</m:id>
<m:name>contract</m:name>
<m:title>合同</m:title>
......@@ -105,6 +220,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_name</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>beefd5f9-a611-44aa-aeaa-f8992c4aeaee</m:id>
<m:name>contractName</m:name>
......@@ -119,6 +243,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>50</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>contract_code</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>e907a0e2-140e-4a12-974b-293b42bfcb19</m:id>
<m:name>contractCode</m:name>
......@@ -133,6 +266,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>800</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>car_info</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>8a23beaa-9ae0-4ade-a096-5dfa5a30ff8e</m:id>
<m:name>carInfo</m:name>
......@@ -147,6 +289,15 @@
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>500</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>memo</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>dd07132e-8ba0-4615-81c2-6f92ccb6df6d</m:id>
<m:name>memo</m:name>
......@@ -156,7 +307,17 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>att_id</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>6b43184e-b4c6-4b87-b3ec-91adcb84d68d</m:id>
<m:name>attId</m:name>
<m:title>车辆行驶证</m:title>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$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>d5ac5ed0-5dc5-43bb-aed9-b55c656990b4</id>
<id>33b770a4-c9cd-4a54-a0bd-8e9d80736045</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge$sequence</name>
<title>人工充值$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge$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>ffbfa187-bb42-47e7-a528-2c50e262577e</id>
<id>35aa3c63-3f1f-4a7e-b187-335d561d6dfb</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge$serial</name>
<title>人工充值$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ArtificialRecharge.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>6b5001ad-97e2-4180-9b2d-39e82a221208</id>
<id>d70fda26-1c0c-4323-9ae4-de6153b30f3b</id>
<name>com.xyst.dinas.finance.bill.ArtificialRecharge</name>
<title>人工充值</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$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>9e9676b8-0005-429f-a2a0-3532e790cb2a</id>
<id>66cfe727-fbb0-4ecc-8bd0-b281a99c0f33</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$sequence</name>
<title>银行充值明细$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$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>6818db29-be3d-44c6-8c40-bf8fa1c9e1e5</id>
<id>07579571-97d1-400d-bc5f-a78bf8757912</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$serial</name>
<title>银行充值明细$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail.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>917485a2-5dfa-46e0-944e-b803b9caf6c8</id>
<id>05292512-3b6b-4766-9af6-8e794064c67f</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail</name>
<title>银行充值明细</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$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>bb311f59-439c-4448-b388-dcb212a0d779</id>
<id>c933719d-8b06-45a8-a2ad-1da8c0c3bba4</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$sequence</name>
<title>费用调整$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$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>e582c96f-40f8-490c-909b-be0678d7b140</id>
<id>2b56d22e-7a16-41bd-bf18-e23b49d1d6c2</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$serial</name>
<title>费用调整$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust.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>4932c941-a05b-4db2-bc85-fde675b66d47</id>
<id>57b3e154-e83e-4a9c-ac2f-d6f88c203d70</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust</name>
<title>费用调整</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$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>24ae3838-f9ab-4bb1-9e69-88e99f720b7e</id>
<id>4065bcc5-a8b7-495d-af02-af3fc8128f84</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund$sequence</name>
<title>财务退款$sequence</title>
<define>bcp.sequence</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund$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>491774e8-6be1-421b-b737-09318c87a6ff</id>
<id>ce4eb012-5633-4095-aeb1-c878446a0141</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund$serial</name>
<title>财务退款$serial</title>
<define>bcp.serial</define>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/FinanceRefund.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>2c7157fc-49ca-4621-b6ad-d6c569624073</id>
<id>64290fb9-267e-451e-ab94-666a70d01fec</id>
<name>com.xyst.dinas.finance.bill.FinanceRefund</name>
<title>财务退款</title>
<define>bcp.biz.Biztype</define>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$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>f5cf6adf-3135-4166-afe9-8bdda8a2506f</id>
<id>d6655343-c11e-441d-9867-327e8f02cb66</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$sequence</name>
<title>出差申请$sequence</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$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>7f136b1e-9576-4a0e-9fc6-39aafc9fb151</id>
<id>68540c53-e8af-41fb-96f0-7769544efa4d</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply$serial</name>
<title>出差申请$serial</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.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>a708e5c6-ec52-4d97-83a6-c4108aa64b30</id>
<id>5fc7ea9c-a5b6-4356-9241-1b0c6cf7b259</id>
<name>com.xyst.dinas.oa.bill.BusinessTripApply</name>
<title>出差申请</title>
<description>出差申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$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>7209907f-0f5c-4d93-bfa0-b275ca723e75</id>
<id>591d1a6a-23c4-42f4-97ee-dfdee099755c</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$sequence</name>
<title>拟文$sequence</title>
<description>拟文</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$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>b5eca9b5-9369-4d49-8372-bb321e7a1e00</id>
<id>82602947-94d8-4952-973a-5d299d7eaa27</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument$serial</name>
<title>拟文$serial</title>
<description>拟文</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.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>81edf524-4457-4474-beb8-15d3bd77c7cf</id>
<id>dce1b269-f2f2-4a6a-bf9f-418ba3bf55dd</id>
<name>com.xyst.dinas.oa.bill.ProtocolDocument</name>
<title>拟文</title>
<description>拟文</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$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>bbcf83a1-36c8-4246-bf24-a90b9bc2efba</id>
<id>639945b7-a866-4cf3-84bf-cecd7aa0153f</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$sequence</name>
<title>证章借出$sequence</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$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>4c0517a9-8f7b-4bd1-b381-67fec3d79505</id>
<id>de698619-2007-4060-bd4d-bb3b5193759c</id>
<name>com.xyst.dinas.oa.bill.SealBorrow$serial</name>
<title>证章借出$serial</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.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>3670ce6a-d27d-4940-aab2-c2a2c1bfa256</id>
<id>5d9efe7f-e11b-4ef6-9077-84c551c62af5</id>
<name>com.xyst.dinas.oa.bill.SealBorrow</name>
<title>证章借出</title>
<description>证章借出</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$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>aaaea5d3-b1ed-4cef-822d-a2739235e220</id>
<id>e5c22fba-6aed-48df-9fbe-778939fbeebf</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$sequence</name>
<title>用车申请$sequence</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$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>f680c320-0a98-49be-9fc4-f83091804542</id>
<id>db9f8720-d353-491f-9232-8008e06b7c6c</id>
<name>com.xyst.dinas.oa.bill.UseCarApply$serial</name>
<title>用车申请$serial</title>
<description>用车申请</description>
......
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.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>e6667ad8-7516-4372-8f3b-7488055b1973</id>
<id>c4b4f611-9066-45d0-b6a4-477cbc5a5ee5</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/dao/PriceAdjustmentDao.java
......@@ -54,4 +54,6 @@ public interface PriceAdjustmentDao extends BaseDao {
List<KObject> getNewsByRegionalCompanyIds(List<UUID> ids);
List<KObject> getSameAdjustmentDateAndLtCreateDate(KObject kobject);
KObject queryPriceAdjustmentByTime(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java
......@@ -28,7 +28,6 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
......@@ -318,6 +317,39 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
}
@Override
public KObject queryPriceAdjustmentByTime(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId) {
String hql = "from " + PriceAdjustmentConstant.ENTITY + " as a "+
" WHERE a.adjustmentDate <= :adjustmentDate and" +
" a.station.id = :stationId "
+ " and a.adjustmentStatus = 1 " ;
return template.execute(session ->{
Query<KObject> query = session.createQuery(hql, KObject.class);
query.setParameter("adjustmentDate", adjustmentDate);
query.setParameter("stationId", stationId);
List<KObject> resultList = query.getResultList();
if(resultList.size() > 0) {
return resultList.get(0);
}else {
String hqlOne = "from " + PriceAdjustmentConstant.ENTITY + " as a "+
" WHERE a.adjustmentDate <= :adjustmentDate and" +
" a.adjustmentEndDate >= :adjustmentDate and" +
" a.station.id = :stationId " ;
return template.execute(session1 ->{
Query<KObject> queryOne = session.createQuery(hqlOne, KObject.class);
queryOne.setParameter("adjustmentDate", adjustmentDate);
queryOne.setParameter("stationId", stationId);
List<KObject> resultOnList = queryOne.getResultList();
if(resultOnList.size() > 0) {
return resultOnList.get(0);
}else {
return null;
}
});
}
});
}
@Override
public List<KObject> getSameAdjustmentDateAndLtCreateDate(Date adjustmentDate, Date createTime, UUID stationId) {
KClass adjustment = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria adjustmentDetachedCriteria = DetachedCriteria.forEntityName(adjustment.getName());
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java
......@@ -142,6 +142,20 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
}
@Override
public String getNewsPriceByStationId(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId) {
KObject kObject= priceAdjustmentDao.queryPriceAdjustmentByTime(currentRegionalCompanyId, adjustmentDate,dinasTypeId,stationId);
if(null != kObject){
KObject[] dinasTypeDetails = kObject.get("dinasTypeDetails").toArray();
for (KObject dinasTypeDetail : dinasTypeDetails) {
if(dinasTypeDetail.get("dinasType").getUuid("id").equals(dinasTypeId)){
return dinasTypeDetail.get("dinasPrice").toString();
}
}
}
return "";
}
@Override
public UUID addPriceAdjustment(KObject kObject) {
return priceAdjustmentDao.create(kObject);
}
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/service/PriceAdjustmentService.java
......@@ -46,4 +46,6 @@ public interface PriceAdjustmentService {
* @return
*/
List<KObject> getNewsByRegionalCompanyIds(UUID currentRegionalCompanyId);
String getNewsPriceByStationId(UUID currentRegionalCompanyId, Date adjustmentDate, UUID dinasTypeId, UUID stationId);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/RegionalCompanyPriceAuthorityController.java
......@@ -6,8 +6,10 @@ import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.xyst.dinas.price.service.PriceAdjustmentService;
import com.xyst.dinas.price.service.RegionalCompanyPriceAuthorityService;
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;
......@@ -69,6 +71,23 @@ public class RegionalCompanyPriceAuthorityController {
return ResponseObj.success("查询成功",newsByRegionalCompanyIds);
}
/**
* 根据场站,时间,砂石获取价格
* @return
*/
@GetMapping("/getNewsPriceByStationId")
public ResponseObj getNewsPriceByStationId(
@RequestParam(value = "regionalCompanyId",required = false) UUID currentRegionalCompanyId,
@DateTimeFormat(pattern="yyyy-MM-dd") @RequestParam("adjustmentDate") Date adjustmentDate,
@RequestParam("dinasTypeId") UUID dinasTypeId,
@RequestParam("stationId") UUID stationId
){
String price = priceAdjustmentService.getNewsPriceByStationId(currentRegionalCompanyId,adjustmentDate,dinasTypeId,stationId);
return ResponseObj.success("查询成功",price);
}
}
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$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>58256242-1a03-4fac-8f30-fdc853883da4</id>
<id>5a4e1893-a05e-4736-80b1-dd4d88676c99</id>
<name>com.xyst.dinas.production.bill.Discharging$sequence</name>
<title>接驳管理$sequence</title>
<description>接驳管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging$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>5e0375c6-6818-4d7d-b582-0ea506db21f1</id>
<id>20ca3202-a4f1-4188-a313-e30400bbe46b</id>
<name>com.xyst.dinas.production.bill.Discharging$serial</name>
<title>接驳管理$serial</title>
<description>接驳管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/Discharging.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>d949835c-c0c1-4464-a306-ed0359945313</id>
<id>4a05ae91-629b-4846-988b-cf4eb0c9ecad</id>
<name>com.xyst.dinas.production.bill.Discharging</name>
<title>接驳管理</title>
<description>接驳管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$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>0cd8de7d-970c-429b-a4f6-c66ca9f8ba1a</id>
<id>2df6c8bf-5094-4c1e-9229-2c0381930dfe</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$sequence</name>
<title>生产管理$sequence</title>
<description>生产管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport$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>583ee153-cc0f-428c-85bc-5a09560f89ee</id>
<id>c1b2b5a4-32c1-4b9e-9a17-ac0f16e03f37</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport$serial</name>
<title>生产管理$serial</title>
<description>生产管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/bill/ProductionPlanReport.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>232e8037-76ef-4922-9626-61c1cd334bfc</id>
<id>f713364c-c087-4e89-bcf5-3f70fac71818</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport</name>
<title>生产管理</title>
<description>生产管理</description>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/ProductionPlanReportAssociateddinasTypeDetail.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>a55c46bb-f5a8-4c8d-b780-aef2a579f1d0</id>
<id>11d69604-24ab-46dc-8ed5-82ecc6b4dea8</id>
<name>com.xyst.dinas.production.datamodel.ProductionPlanReportAssociateddinasTypeDetail</name>
<title>生产计划采砂类型和砂石量子表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/datamodel/SandMiningAssociatedstationDetail.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>1b94edef-b99d-4bf5-a0a3-f2c2c5839977</id>
<id>212de0e3-b4fc-4bc7-b4ee-930788d844aa</id>
<name>com.xyst.dinas.production.datamodel.SandMiningAssociatedstationDetail</name>
<title>采砂许可证场站表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$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>5a0c3fd6-d2d8-4218-8482-995b594974e3</id>
<id>70f0ca56-cf83-42ee-ba2c-89e9ec5241d2</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation$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>a26f7c0c-db38-42e1-8e62-1d129d4b990a</id>
<id>445f1c25-c5ad-493d-9cc6-0bc083fba7c1</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/PersonnelViolation.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>ddc54976-85a9-4fb5-98b4-1f4370a23a22</id>
<id>bcb70b44-639f-4995-9374-1559e7514552</id>
<name>com.xyst.dinas.safe.bill.PersonnelViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$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>470340db-b390-481e-a5fe-cea5021db2bb</id>
<id>3635d1e7-3bb6-4748-a13a-39338b4ee037</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$sequence</name>
<title>生产违规记录$sequence</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation$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>70c0227b-c0ec-4d54-a795-14c978b4a1e0</id>
<id>bf1b8c35-8134-408d-b623-646003fc9d9a</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation$serial</name>
<title>生产违规记录$serial</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ProductionLineViolation.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>d53a9bf5-19ce-4675-9888-ec4e10ca4712</id>
<id>37af3895-03a0-472f-88f2-a302ba38369d</id>
<name>com.xyst.dinas.safe.bill.ProductionLineViolation</name>
<title>生产违规记录</title>
<description>生产违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$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>833b81ff-3248-439c-a677-32e0a322461a</id>
<id>4a1531ea-5480-4a46-9699-705b408c7fbc</id>
<name>com.xyst.dinas.safe.bill.SafeLog$sequence</name>
<title>安全日志$sequence</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog$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>e490b1ff-5a8e-4ace-981c-f41fb97019b1</id>
<id>64940413-dc3f-4d9d-a7d8-3256f8f74639</id>
<name>com.xyst.dinas.safe.bill.SafeLog$serial</name>
<title>安全日志$serial</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/SafeLog.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>f6416ad1-6e27-4bff-a854-897ffa2439a3</id>
<id>75f90c28-698a-4524-bceb-d46b3161082b</id>
<name>com.xyst.dinas.safe.bill.SafeLog</name>
<title>安全日志</title>
<description>安全日志</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$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>d18e2a39-a873-4822-8008-54cf20d028ae</id>
<id>d4c0b652-22d0-4c2f-b62a-ed80305e7866</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$sequence</name>
<title>船舶违规记录$sequence</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation$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>841b813a-71dd-4177-9c35-8da2e3dd8624</id>
<id>a99ff226-6c0c-4026-8ecc-b3ccc2ae8f7f</id>
<name>com.xyst.dinas.safe.bill.ShipViolation$serial</name>
<title>船舶违规记录$serial</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/ShipViolation.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>a55e3107-b5c9-47a0-8f4b-6cee1682d756</id>
<id>de7f8c8b-c729-4702-a34a-0d2335384861</id>
<name>com.xyst.dinas.safe.bill.ShipViolation</name>
<title>船舶违规记录</title>
<description>船舶违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$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>a5f41ea7-9a80-4082-a82e-de9da5db38b1</id>
<id>c20d8a8c-fec2-4151-b24f-d00b36f6f18e</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$sequence</name>
<title>人员违规记录$sequence</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation$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>2282d449-b3dc-4568-9b0a-eca4d8128d5f</id>
<id>eda12fd5-4434-4639-a8f0-acc5748e9dc1</id>
<name>com.xyst.dinas.safe.bill.StaffViolation$serial</name>
<title>人员违规记录$serial</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/StaffViolation.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>0a576416-1a3a-4558-81dd-d91978e383a8</id>
<id>16f0b947-2e81-4320-ae62-38ac8079d1bf</id>
<name>com.xyst.dinas.safe.bill.StaffViolation</name>
<title>人员违规记录</title>
<description>人员违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$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>ebb52d04-7ae3-4d6e-8ac9-c2bc50a4e5c7</id>
<id>47a3038f-5bb0-494c-afd9-5a332a87fcb5</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$sequence</name>
<title>安全教育培训记录$sequence</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation$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>af597004-48c0-4c4f-a410-00206d888239</id>
<id>53ec9523-fab6-47bb-b7a7-65fe3638daa6</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation$serial</name>
<title>安全教育培训记录$serial</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/bill/TrainingEducation.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>bc11a6f7-7e04-4b04-8b5a-5ef2f57c270c</id>
<id>97c8a567-f0e3-4209-840c-e92f9cfe3cfe</id>
<name>com.xyst.dinas.safe.bill.TrainingEducation</name>
<title>安全教育培训记录</title>
<description>安全教育培训记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/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>5e6c5580-f621-474f-81f3-06cb8073ec3d</id>
<id>ba90df9d-42e4-4655-92ae-cdf9988bb9c2</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$sequence</name>
<title>车辆违规记录$sequence</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/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>2c3bad61-14ba-4e8f-a3a2-c88f3cce140a</id>
<id>38b8bc7f-0bd5-41e4-a218-5dd95552de4c</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation$serial</name>
<title>车辆违规记录$serial</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/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>480d9a1b-ee62-4b0a-ab45-8cadd29d9f2d</id>
<id>c79949d6-6e52-48d2-9f61-2541c44e5f92</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.safe/src/main/resources/com/xyst/dinas/safe/datamodel/SafeLogAssociatedStaffDetail.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>aebe6877-f966-4cff-9ff9-ee87a06ae302</id>
<id>85064c7c-010d-4f61-bb78-0dd5017f7a65</id>
<name>com.xyst.dinas.safe.datamodel.SafeLogAssociatedStaffDetail</name>
<title>检查人员明细表</title>
<define>bcp.type.Class</define>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/CoefficientOrPriceConfiguration.java 0 → 100644
package com.xyst.dinas.sales.config;
import com.beecode.amino.metadata.runtime.MetadataMech;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.TypeConstants;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
import com.xyst.dinas.sales.dao.CoefficientOrPriceDao;
import com.xyst.dinas.sales.internal.dao.CoefficientOrPriceDaoImpl;
import com.xyst.dinas.sales.internal.service.CoefficientOrPriceServiceImpl;
import com.xyst.dinas.sales.service.CoefficientOrPriceService;
import com.xyst.dinas.sales.web.CoefficientOrPriceController;
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;
public class CoefficientOrPriceConfiguration {
@Autowired
@Qualifier(TypeConstants.CLASS_MECH)
private MetadataMech<KClass> typeMech;
@org.springframework.context.annotation.Bean(CoefficientOrPriceConstant.ENTITY)
public KClass dischargingEntity() {
return typeMech.createStaticBeanByResource(
new ClassPathResource("/com/xyst/dinas/sales/datamodel/CoefficientOrPrice.jmx", KClass.class));
}
//CoefficientOrPriceDaoImpl相关bean配置
@Bean
public CoefficientOrPriceController coefficientOrPriceController(){
return new CoefficientOrPriceController();
}
@Bean
public CoefficientOrPriceService coefficientOrPriceService(){
return new CoefficientOrPriceServiceImpl();
}
@Bean
public CoefficientOrPriceDao coefficientOrPriceDao(){
return new CoefficientOrPriceDaoImpl();
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/SalesConfiguration.java
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;
......@@ -30,6 +25,7 @@ import com.xyst.dinas.sales.web.InventoryController;
import com.xyst.dinas.sales.web.NeedPlanController;
import com.xyst.dinas.sales.web.SalesPlanController;
import com.xyst.dinas.sales.web.SalesRecordController;
import org.springframework.context.annotation.Bean;
public class SalesConfiguration {
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/VehicleAmountPartyConfiguration.java 0 → 100644
package com.xyst.dinas.sales.config;
import com.beecode.amino.metadata.runtime.MetadataMech;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.TypeConstants;
import com.xyst.dinas.sales.constant.VehicleAmountPartyConstant;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import com.xyst.dinas.sales.internal.dao.VehicleAmountPartyDaoImpl;
import com.xyst.dinas.sales.internal.service.VehicleAmountPartyServiceImpl;
import com.xyst.dinas.sales.service.VehicleAmountPartyService;
import com.xyst.dinas.sales.web.VehicleAmountPartyController;
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;
public class VehicleAmountPartyConfiguration {
@Autowired
@Qualifier(TypeConstants.CLASS_MECH)
private MetadataMech<KClass> typeMech;
@Bean(VehicleAmountPartyConstant.ENTITY)
public KClass dischargingEntity() {
return typeMech.createStaticBeanByResource(
new ClassPathResource("/com/xyst/dinas/sales/datamodel/VehicleAmountParty.jmx", KClass.class));
}
//VehicleAmountPartyDaoImpl相关bean配置
@Bean
public VehicleAmountPartyController vehicleAmountPartyController(){
return new VehicleAmountPartyController();
}
@Bean
public VehicleAmountPartyService vehicleAmountPartyService(){
return new VehicleAmountPartyServiceImpl();
}
@Bean
public VehicleAmountPartyDao vehicleAmountPartyDao(){
return new VehicleAmountPartyDaoImpl();
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/CoefficientOrPriceConstant.java 0 → 100644
package com.xyst.dinas.sales.constant;
public interface CoefficientOrPriceConstant {
/**
* 实体名
*/
String ENTITY = "com.xyst.dinas.sales.datamodel.CoefficientOrPrice";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/VehicleAmountPartyConstant.java 0 → 100644
package com.xyst.dinas.sales.constant;
public interface VehicleAmountPartyConstant {
/**
* 实体名
*/
String ENTITY = "com.xyst.dinas.sales.datamodel.VehicleAmountParty";
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/CoefficientOrPriceDao.java 0 → 100644
package com.xyst.dinas.sales.dao;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.dao.BaseDao;
import java.util.List;
import java.util.UUID;
/**
* @author yanheng
*/
public interface CoefficientOrPriceDao extends BaseDao {
KObject load(UUID id);
//新增
UUID create(KObject insertKobject);
Page<KObject> listCoefficientOrPriceInfoPaging(Page<KObject> page, int type, List<UUID> regionalCompanyIds);
void modify(KObject insertKobject);
Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/VehicleAmountPartyDao.java 0 → 100644
package com.xyst.dinas.sales.dao;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.dao.BaseDao;
import java.util.List;
import java.util.UUID;
/**
* @author yanheng
*/
public interface VehicleAmountPartyDao extends BaseDao {
KObject load(UUID id);
UUID create(KObject kObject);
Page<KObject> listVehicleAmountPartygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds);
void deleteById(UUID id);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/enumeration/VehicleAmountPartyErrorCodeEnum.java 0 → 100644
package com.xyst.dinas.sales.enumeration;
import com.beecode.inz.common.ErrorCode;
public enum VehicleAmountPartyErrorCodeEnum implements ErrorCode {
VEHICLE_AMOUNT_PARTY_ADVANCE_BALANCE("007032101", "预付款余额扣减失败"),
VEHICLE_AMOUNT_ADVANCE_BALANCE_INSUFFICIENT("007032102", "预付款余额不足，请先联系客户进行充值操作");
private String code;
private String description;
VehicleAmountPartyErrorCodeEnum(String code, String description) {
this.code = code;
this.description = description;
}
@Override
public String getCode() {
return code;
}
@Override
public String getDescription() {
return description;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/CoefficientOrPriceDaoImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.dao;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.staff.BapContext;
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.enumeration.OrganizationTypeEnum;
import com.xyst.dinas.biz.service.DinasOrganizationService;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
import com.xyst.dinas.sales.dao.CoefficientOrPriceDao;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.json.JSONObject;
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;
import java.util.Map;
import java.util.UUID;
/**
* @author yanheng
*/
public class CoefficientOrPriceDaoImpl extends AbstractBaseDao implements CoefficientOrPriceDao , CoefficientOrPriceConstant {
@Autowired
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private CoefficientOrPriceDao coefficientOrPriceDao;
@Override
public KObject load(UUID id) {
return (KObject) template.load(ENTITY, id);
}
@Override
public UUID create(KObject kObject) {
KObject staff = AminoContextHolder.getContext().getStaff();
if (null == kObject.getUuid(BaseConstants.ID)) {
kObject.set(BaseConstants.ID, UUID.randomUUID());
}
kObject.set(BaseConstants.CREATOR, staff);
kObject.set(BaseConstants.CREATE_TIME, new Date());
kObject.set(BaseConstants.DEL, false);
kObject.set("regionalCompany", getCurrentLoginRegionalCompany());
return ((UUID) template.save(kObject));
}
/**
* 获取当前登录的区域公司
* @return
*/
public KObject getCurrentLoginRegionalCompany() {
Map<String, String> map = bapContext.getCurrentUserDatas();
String currentRegionalCompany = map.get("currentRegionalCompany");
if(StringUtils.isNotBlank(currentRegionalCompany)){
JSONObject obj = new JSONObject(currentRegionalCompany);
return dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
}
return null;
}
@Override
public Page<KObject> listCoefficientOrPriceInfoPaging(Page<KObject> page, int type, List<UUID> regionalCompanyIds) {
KClass bean = Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
//类型查询 运船 还是 车辆
detachedCriteria.add(Restrictions.eq("type", type));
//区域公司
if(!CollectionUtils.isEmpty(regionalCompanyIds)){
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
}
detachedCriteria.addOrder(Order.desc(BaseConstants.CREATE_TIME));
int offset = page.getPageSize() * (page.getPageNo() - 1);
List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
Long totalCount = (Long) detachedCriteria.setProjection(Projections.rowCount()).getExecutableCriteria(template.getSessionFactory().getCurrentSession()).setFirstResult(0).setMaxResults(1).uniqueResult();
page.setTotal(Math.toIntExact(totalCount));
page.setDatas(list);
return page;
}
@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(BaseConstants.MODIFY_TIME, new Date());
kobject.set(BaseConstants.MODIFIER, staff);
kobject.set(BaseConstants.DEL, false);
kobject.set("regionalCompany", getCurrentLoginRegionalCompany());
template.merge(kobject);
}
@Override
public Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId) {
KClass bean = Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
KObject currentLoginRegionalCompany = getCurrentLoginRegionalCompany();
if (currentLoginRegionalCompany != null && currentLoginRegionalCompany. getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
}
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
if (type != null) {
detachedCriteria.add(Restrictions.eq("type", type));
}
if (stationId != null) {
detachedCriteria.add(Restrictions.eq("station.id", stationId));
}
if (dinasTypeId != null) {
detachedCriteria.add(Restrictions.eq("dinasType.id", dinasTypeId));
}
List<KObject> queryList = (List<KObject>) template.findByCriteria(detachedCriteria);
if(queryList.size() > 0){
return queryList.get(0);
}
return null;
}
/**
* 抽象方法，需要实现类提供HibernateTemplate
*
* @return HibernateTemplate
*/
@Override
protected HibernateTemplate getHibernateTemplate() {
return template;
}
/**
* 抽象方法，需要实现类提供当前ModelName
*
* @return String
*/
@Override
protected String getModelName() {
return CoefficientOrPriceConstant.ENTITY;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/VehicleAmountPartyDaoImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.dao;
import com.beecode.amino.core.Amino;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.staff.BapContext;
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.service.DinasOrganizationService;
import com.xyst.dinas.sales.constant.VehicleAmountPartyConstant;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.*;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.util.CollectionUtils;
import java.util.*;
/**
* @author yanheng
*/
public class VehicleAmountPartyDaoImpl extends AbstractBaseDao implements VehicleAmountPartyDao, VehicleAmountPartyConstant {
@Autowired
private HibernateTemplate template;
@Autowired
private DinasOrganizationService dinasOrganizationService;
@Autowired
private BapContext bapContext;
@Autowired
private VehicleAmountPartyDao vehicleAmountPartyDao;
@Override
public KObject load(UUID id) {
return (KObject) template.load(ENTITY, id);
}
@Override
public UUID create(KObject kObject) {
KObject staff = AminoContextHolder.getContext().getStaff();
if (null == kObject.getUuid(BaseConstants.ID)) {
kObject.set(BaseConstants.ID, UUID.randomUUID());
}
kObject.set(BaseConstants.CREATOR, staff);
kObject.set(BaseConstants.CREATE_TIME, new Date());
kObject.set(BaseConstants.DEL, false);
kObject.set("regionalCompany", getCurrentLoginRegionalCompany());
return ((UUID) template.save(kObject));
}
/**
* 获取当前登录的区域公司
* @return
*/
public KObject getCurrentLoginRegionalCompany() {
Map<String, String> map = bapContext.getCurrentUserDatas();
String currentRegionalCompany = map.get("currentRegionalCompany");
if(StringUtils.isNotBlank(currentRegionalCompany)){
JSONObject obj = new JSONObject(currentRegionalCompany);
return dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
}
return null;
}
@Override
public Page<KObject> listVehicleAmountPartygInfoPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) {
KClass bean = Amino.getStaticMetadataContext().getBean(VehicleAmountPartyConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
ArrayList<Criterion> criteria = new ArrayList<>();
Conjunction dis = Restrictions.conjunction();
//参数赋值
criteria.add(Restrictions.eq("del", false));
if (null != purchaseSandUnitId) {
criteria.add(Restrictions.eq("purchaseSandUnit.id", purchaseSandUnitId));
}
//区域公司
if(!CollectionUtils.isEmpty(regionalCompanyIds)){
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
}
for (Criterion criterion : criteria) {
dis.add(criterion);
}
detachedCriteria.add(Restrictions.and(dis));
detachedCriteria.addOrder(Order.desc("createTime"));
int offset = page.getPageSize() * (page.getPageNo() - 1);
page.setTotal(template.findByCriteria(detachedCriteria).size());
List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
page.setDatas(list);
return page;
}
@Override
public void deleteById(UUID id) {
KObject staff = AminoContextHolder.getContext().getStaff();
KObject kobject = (KObject) template.load(ENTITY, id);
kobject.set(BaseConstants.MODIFY_TIME, new Date());
kobject.set(BaseConstants.MODIFIER, staff);
kobject.set(BaseConstants.DEL, true);
template.update(kobject);
}
/**
* 抽象方法，需要实现类提供HibernateTemplate
*
* @return HibernateTemplate
*/
@Override
protected HibernateTemplate getHibernateTemplate() {
return template;
}
/**
* 抽象方法，需要实现类提供当前ModelName
*
* @return String
*/
@Override
protected String getModelName() {
return VehicleAmountPartyConstant.ENTITY;
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/CoefficientOrPriceServiceImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.service;
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.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.StationDao;
import com.xyst.dinas.sales.constant.CoefficientOrPriceConstant;
import com.xyst.dinas.sales.dao.CoefficientOrPriceDao;
import com.xyst.dinas.sales.service.CoefficientOrPriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
@Transactional(rollbackFor = Exception.class)
public class CoefficientOrPriceServiceImpl implements CoefficientOrPriceService {
@Autowired
private CoefficientOrPriceDao coefficientOrPriceDao;
@Autowired
private StationDao stationDao;
@Autowired
private DinasTypeDao dinasTypeDao;
/**
* @return java.util.UUID
* 新建折方系数,单价
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
**/
@Override
@Transactional
public void addCoefficientOrPrice(JsonNode jsonNode) {
KObject insertKobject;
JsonNode coefficientOrPrices = jsonNode.withArray("coefficientOrPrices");
for (JsonNode coefficientOrPrice : coefficientOrPrices) {
insertKobject = JSONObjectUtils.toObject(coefficientOrPrice, Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class));
//场站信息
if (null != coefficientOrPrice.get("stationId")) {
insertKobject.set("station", stationDao.load(coefficientOrPrice.get("stationId").textValue()));
}
//砂石
if (null != coefficientOrPrice.get("dinasTypeId")) {
insertKobject.set("dinasType", dinasTypeDao.load(coefficientOrPrice.get("dinasTypeId").textValue()));
}
//折方系数
if (null != coefficientOrPrice.get("coefficientOf")) {
insertKobject.set("coefficientOf", new BigDecimal(coefficientOrPrice.get("coefficientOf").doubleValue()));
}
//价格
if (null != coefficientOrPrice.get("price")) {
insertKobject.set("price", new BigDecimal(coefficientOrPrice.get("price").doubleValue()));
}
//类型必传
if (null != coefficientOrPrice.get("type")) {
insertKobject.set("type", coefficientOrPrice.get("type").intValue());
}
//判断是否是添加还是修改
if (null == insertKobject.getUuid("id")) {
UUID uuid = coefficientOrPriceDao.create(insertKobject);
} else {
coefficientOrPriceDao.modify(insertKobject);
}
}
}
@Override
public Page<KObject> queryByPaging(Page<KObject> page, int type, List<UUID> regionalCompanyIds) throws Exception {
if (page.getPageNo() == 0 || page.getPageSize() == 0) {
throw new Exception("pageSize or offset is null");
}
return coefficientOrPriceDao.listCoefficientOrPriceInfoPaging(page, type,regionalCompanyIds);
}
@Override
public void updateCoefficientOrPrice(JsonNode jsonNode) {
KObject updateKobject;
JsonNode coefficientOrPrices = jsonNode.withArray("coefficientOrPrices");
for (JsonNode coefficientOrPrice : coefficientOrPrices) {
updateKobject = JSONObjectUtils.toObject(coefficientOrPrice, Amino.getStaticMetadataContext().getBean(CoefficientOrPriceConstant.ENTITY, KClass.class));
//场站信息
if (!StringUtils.isEmpty(coefficientOrPrice.get("stationId").textValue())) {
updateKobject.set("station", stationDao.load(coefficientOrPrice.get("stationId").textValue()));
}
//砂石
if (!StringUtils.isEmpty(coefficientOrPrice.get("dinasTypeId").textValue())) {
updateKobject.set("dinasType", dinasTypeDao.load(coefficientOrPrice.get("dinasTypeId").textValue()));
}
//折方系数
if (null != coefficientOrPrice.get("coefficientOf")) {
updateKobject.set("coefficientOf", new BigDecimal(coefficientOrPrice.get("coefficientOf").doubleValue()));
}
//价格
if (null != coefficientOrPrice.get("price")) {
updateKobject.set("price", new BigDecimal(coefficientOrPrice.get("price").doubleValue()));
}
//类型必传
if (null != coefficientOrPrice.get("type")) {
updateKobject.set("type", coefficientOrPrice.get("type").intValue());
}
coefficientOrPriceDao.modify(updateKobject);
}
}
@Override
public Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId) {
return coefficientOrPriceDao.priceInfo(type,stationId,dinasTypeId);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/VehicleAmountPartyServiceImpl.java 0 → 100644
package com.xyst.dinas.sales.internal.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.exception.BusinessException;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.StationDao;
import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.contract.service.ContractService;
import com.xyst.dinas.project.dao.ProjectFiledDao;
import com.xyst.dinas.project.dao.PurchaseSandCompanyDao;
import com.xyst.dinas.sales.dao.VehicleAmountPartyDao;
import com.xyst.dinas.sales.enumeration.VehicleAmountPartyErrorCodeEnum;
import com.xyst.dinas.sales.service.VehicleAmountPartyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
import java.util.UUID;
@Transactional(rollbackFor = Exception.class)
public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService {
@Autowired
private VehicleAmountPartyDao vehicleAmountPartyDao;
@Autowired
private StationDao stationDao;
@Autowired
private DinasTypeDao dinasTypeDao;
@Autowired
private PurchaseSandCompanyDao purchaseSandCompanyDao;
@Autowired
private ProjectFiledDao projectFiledDao;
@Autowired
private ContractDao contractDao;
@Autowired
ContractService contractService;
/**
* @Author yanHeng
* @Date 2022/4/6 11:36
* @Param [kobject]
* @return java.util.UUID
* 新建车辆量方信息
**/
@Override
@Transactional(rollbackFor = Exception.class)
public UUID addVehicleAmountParty(KObject kObject)throws BusinessException {
//添加车辆量方信息
//场站信息
UUID stationId = kObject.get("station").getUuid("id");
UUID projectId = kObject.get("project").getUuid("id");
UUID purchaseSandUnitId = kObject.get("purchaseSandUnit").getUuid("id");
UUID contractId = kObject.get("contract").getUuid("id");
UUID dinasTypeId = kObject.get("dinasType").getUuid("id");
KObject contract = contractDao.load(contractId);
kObject.set("station", stationDao.load(stationId));
kObject.set("contract", contract);
kObject.set("project", projectFiledDao.load(projectId));
kObject.set("purchaseSandUnit", purchaseSandCompanyDao.load(purchaseSandUnitId));
kObject.set("dinasType", dinasTypeDao.load(dinasTypeId));
UUID uuid = vehicleAmountPartyDao.create(kObject);
//扣减预付款余额 ,取得总价 进行扣减
//查询合同余额,如果预付款小于总价,不允许交易
BigDecimal amount ;
KObject contractObject = contractService.queryContract(contractId);
BigDecimal advanceBalance = contractObject.getBigDecimal("advanceBalance");
if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(kObject.getString("amount"))) == -1) {
throw new BusinessException("预付款余额不足，请先联系客户进行充值操作",VehicleAmountPartyErrorCodeEnum.VEHICLE_AMOUNT_ADVANCE_BALANCE_INSUFFICIENT);
}
//进行扣减操作 传入当前合同 和 扣减总价,
// 更新合同子表合同砂石余量(吨)-更新合同表付款余额、销售总量信息
amount = BigDecimal.ZERO.subtract(new BigDecimal(kObject.getString("amount")));
Boolean flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
if(!flag){
throw new BusinessException("预付款余额扣减失败",VehicleAmountPartyErrorCodeEnum.VEHICLE_AMOUNT_PARTY_ADVANCE_BALANCE);
}
return uuid;
}
@Override
public Page<KObject> queryByPaging(Page<KObject> page, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception {
if (page.getPageNo() == 0 || page.getPageSize() == 0) {
throw new Exception("pageSize or offset is null");
}
return vehicleAmountPartyDao.listVehicleAmountPartygInfoPaging(page, purchaseSandUnitId,regionalCompanyIds);
}
@Override
public KObject getById(UUID id) {
return vehicleAmountPartyDao.load(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public ResponseObj deleteById(UUID id) {
BigDecimal amount ;
//逻辑删除 反还合同的预付款金额= 车辆量方总价
KObject vehicleAmountParty = vehicleAmountPartyDao.load(id);
//获取车辆量方总价
amount = BigDecimal.ZERO.add(new BigDecimal(vehicleAmountParty.getString("amount")));
UUID contractId = vehicleAmountParty.get("contract").getUuid("id");
UUID dinasTypeId = vehicleAmountParty.get("dinasType").getUuid("id");
Boolean flag = contractService.modifyInventory(contractId,
dinasTypeId, BigDecimal.ZERO, amount);
if(!flag){
return ResponseObj.error(400,"预付款余额反还异常");
}else{
vehicleAmountPartyDao.deleteById(id);
}
return ResponseObj.success("删除成功");
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/CoefficientOrPriceService.java 0 → 100644
package com.xyst.dinas.sales.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.fasterxml.jackson.databind.JsonNode;
import java.util.List;
import java.util.UUID;
public interface CoefficientOrPriceService {
//新增折方系数,单价
void addCoefficientOrPrice(JsonNode jsonNode);
//查询折方
Page<KObject> queryByPaging(Page<KObject> objectPage, int type, List<UUID> regionalCompanyIds)throws Exception;
//修改
void updateCoefficientOrPrice(JsonNode jsonNode);
//查询价格/系数
Object priceInfo(Integer type, UUID stationId, UUID dinasTypeId);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/VehicleAmountPartyService.java 0 → 100644
package com.xyst.dinas.sales.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import java.util.List;
import java.util.UUID;
public interface VehicleAmountPartyService {
UUID addVehicleAmountParty(KObject kobject) throws Exception;
Object queryByPaging(Page<KObject> objectPage, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception ;
KObject getById(UUID id);
ResponseObj deleteById(UUID id);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/CoefficientOrPriceController.java 0 → 100644
package com.xyst.dinas.sales.web;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.json.JSONObjectUtils;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.sales.service.CoefficientOrPriceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.UUID;
@RestController
@RequestMapping(value="/sales/coefficient")
public class CoefficientOrPriceController {
private static final Logger logger = LoggerFactory.getLogger(CoefficientOrPriceController.class);
@Autowired
private CoefficientOrPriceService coefficientOrPriceService;
/**
* 新建折方系数
* @param body
* @return ResponseObj
*/
@PostMapping("/addCoefficientOrPrice")
public ResponseObj create(@RequestBody String body){
JsonNode jsonNode = JSONObjectUtils.toJson(body);
coefficientOrPriceService.addCoefficientOrPrice(jsonNode);
return ResponseObj.success("保存成功");
}
/**
* 修改折方系数
* @param body
* @return ResponseObj
*/
@PostMapping("/updateCoefficientOrPrice")
public ResponseObj update(@RequestBody String body){
JsonNode jsonNode = JSONObjectUtils.toJson(body);
coefficientOrPriceService.updateCoefficientOrPrice(jsonNode);
return ResponseObj.success("修改成功");
}
/**
* @Author yanHeng
* @Date 2022/4/7 10:02
* @Param [pageNo, pageSize, type]
* @return com.beecode.inz.basis.team.pojo.ResponseObj
* 查询折方系数,后续会对接运船折方单价
**/
@RequestMapping(value = "/list/page", method = RequestMethod.GET)
public ResponseObj getListPage(
@RequestParam(name = "pageNo") Integer pageNo,
@RequestParam(name = "pageSize") Integer pageSize,
@RequestParam(name = "type", required = true) int type,
@RequestParam(name = "regionalCompanyIds",required = false) List<UUID> regionalCompanyIds
) throws Exception {
Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(pageNo);
objectPage.setPageSize(pageSize);
return ResponseObj.success("查询成功", coefficientOrPriceService.queryByPaging(objectPage, type, regionalCompanyIds));
}
@RequestMapping(value = "list/priceInfo", method = RequestMethod.GET)
public ResponseObj groupInfo(
@RequestParam(name = "type", required = false) Integer type,
@RequestParam(name = "stationId", required = false) UUID stationId,
@RequestParam(name = "dinasTypeId", required = false)UUID dinasTypeId
) throws Exception {
return ResponseObj.success("查询成功", coefficientOrPriceService.priceInfo(type,stationId,dinasTypeId));
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id){
System.out.println("testok");
return ResponseObj.success("查询成功", id);
}
}
\ No newline at end of file
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