Skip to content

C
cloud-fb
Commit 252bc206 by yanHeng
Options

[新增] 车辆量方查询,系数,新增等接口

parent 4bd251e6
Showing with 403 additions and 78 deletions
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>1fcd99da-ae3e-4b6b-9889-c0afb11803f8</id>
<id>877eb7c9-d2f7-46c2-a360-d2b80d685907</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>7d1c908c-bd12-43c9-b7ce-07d8ca86932e</id>
<id>55836d54-35df-4bf7-be82-1b20882009a9</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>118ff82e-c9d6-4bba-9be1-f6a7415d3b1d</id>
<id>dfaee8b8-e032-4772-bb07-60e884fafd5a</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>dbdf7c13-5cb0-4364-9a41-f34f599843b3</id>
<id>6aa726fa-af9a-45cd-a9bb-3e154748611a</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>ad568f32-2377-499a-8245-32a133592100</id>
<id>d6d2a454-1681-4fd8-a96f-9e244c79c59b</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>feb7816d-13ef-4723-8676-5d63cba71f56</id>
<id>90d36c35-87df-4dc5-af5d-d92445d6fbe2</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>fd466795-82c7-41c4-9b6f-27fc9568a35a</id>
<id>5f3a6bb6-48dd-4fed-85d6-8ee1cf3893d4</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>ddc5e2a5-cb8e-4e20-9b7f-6d89798d0fb3</id>
<id>a8dd979b-35d7-4ea8-82c5-8b656cbc619b</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>91d5cfa4-4ecf-4a96-90f4-ec66a6803791</id>
<id>fe165555-1d7b-48b4-9b2c-1261f13a7e72</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>3f9f7f67-4ee7-4976-916f-08a47c4af616</id>
<id>9d18ada1-f8f6-40ea-b4f0-09485ec94f49</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>ff7d68c1-0742-4a8f-ba2f-4a76c9c06e3f</id>
<id>b26db798-0314-4138-8092-741fa66fb307</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>4a9cbea1-40de-457b-9154-cc285edf558f</id>
<id>49fea4f2-8f70-416c-9503-761cdce50d7a</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>ff5a8d2d-b30d-4078-bcb0-149a07d2369c</id>
<id>a1afbf20-b418-4740-9a24-0d57e58d8d38</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>3213e399-0acf-4577-987c-cb12430b8bfa</id>
<id>09cd97c4-dace-4237-8527-fe8508724e46</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>273de633-8239-4867-9671-e52d831b527c</id>
<id>fd6cef4c-426d-47d1-b597-d7ac013a7345</id>
<name>com.xyst.dinas.biz.bill.xystOrganization</name>
<title>组织机构</title>
<description>组织机构</description>
......
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>3e17d6f7-0b51-4312-8d53-cc177ac3cf83</id>
<id>09bff7c2-5559-480c-a04c-33159a45428e</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>033f42cc-cd08-4de2-a96f-d9dd74eba2e3</id>
<id>9976660e-f361-4978-ba48-b490f9d0aeaa</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>f7096b4c-8936-469c-a98a-03096a641b22</id>
<id>a01bff08-e393-4b46-b71f-61ba72f6d467</id>
<name>com.xyst.dinas.contract.bill.ContractBill</name>
<title>合同单据</title>
<description>合同单据</description>
......
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>0bb1d92c-1b41-4a1b-9cd2-6220b43976da</id>
<id>93560dae-3998-4f24-b070-a5fbe76b7541</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>778bdb2a-ee28-4679-b12b-7b6658b2c5b0</id>
<id>971cc855-d4e4-4af5-8e2b-f9c1d1a5363c</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>bbad4263-de84-448d-93b9-7ca3129bd48b</id>
<id>70527253-523c-4a19-af52-867940c2525f</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>cf25f09d-e567-45b1-9bc1-10f381b0d6db</id>
<id>f1d067bb-3455-4cd3-962a-ba73f88deb04</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>1dcfca01-5194-44df-a8bb-3a8f54798ac9</id>
<id>74762fa9-f850-492f-9301-ca88de473816</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>40c0dcc3-f7bf-48bc-b6f0-b406187a51f5</id>
<id>428914c8-f048-464b-9c95-276b839875e5</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>6d094a46-9904-4655-96eb-5d345c4710c2</id>
<id>182b3f91-41dc-4a53-ba98-a03170950109</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>a2bf35e4-b3d1-43b8-a76b-bd35b136bb67</id>
<id>821a24a8-a5e4-4a39-a9cb-d5afcccf2b66</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>774da827-8ec3-407d-bdda-95a6067fb02a</id>
<id>05aeb494-b353-4883-a009-66750c6a2a68</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>63c20e7f-967f-4ba5-be92-abfa5580ef69</id>
<id>b355c7af-1f41-4b83-a8b7-485c1d88b8ac</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>7621ae2f-9f93-4b58-b589-663c27e3b227</id>
<id>012cd2dd-1b75-4363-9e02-78cc9b5431be</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>bbccf1f0-944a-459e-ac88-7844720047db</id>
<id>2c741186-3cc9-42c7-b4b6-ce71e919b95e</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>697c466e-aecd-4e95-a5ac-75cacff0c5ed</id>
<id>59e7acae-5920-429d-a415-b42eb220e9e7</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>04238b76-bffc-44f7-af88-a971d8951c69</id>
<id>8e1908c8-34fe-41e7-95ce-e6e7cf0ecdf0</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>8b2da032-63f4-4aa2-a40f-4c6dd21b4af0</id>
<id>77af1be7-9fda-4562-ba65-a6ed02e4a105</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>97c17ccd-d68b-412c-b352-83c27849ddff</id>
<id>b828100d-9294-4c6c-a53a-2c0a0f060e42</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>a4ec58ac-43dd-47ff-bda5-1d1de6a96eb9</id>
<id>e26a40a8-c12a-4513-ab2c-23231adc3e4e</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>cf7cbea4-52be-485c-a953-0e360e247b5c</id>
<id>76bbadac-904b-44c3-b538-3f8e663d09f4</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>9b61a610-cf75-4b46-97be-e0e65327faed</id>
<id>d536a140-b0bd-492f-bcec-9de46979f1d4</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>54ab7ab0-b86f-4a93-947d-3001bca83a1e</id>
<id>2848e4a5-6848-45a8-8fc7-dadb2623f50a</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>11fe5a6a-04cd-4b4a-8113-ded4b879a72b</id>
<id>4aa1ccf3-d198-4f11-af44-cb8dda81e61b</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>4c0ef1c8-de69-402a-9fdd-763a54f82926</id>
<id>ee0886c4-a9b5-4d49-9d90-6c7ed48e9f15</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>719ba5a3-8b7d-4b9b-82a7-b563087b6a29</id>
<id>aa602c00-cba5-49e7-84be-672707e759e6</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>4ca79c7d-5b4b-4ca5-8f0a-514d138a28b2</id>
<id>8e62d72e-508a-45ed-b8a7-06bb9a2ba3a9</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>160b113c-eeb9-47ad-9106-2bfa27b10cfe</id>
<id>fd364715-552a-4de9-98d1-15331a4586d8</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>5982094e-32d9-4cf6-8a94-28c7dd471f31</id>
<id>3c30ece9-f38e-45ad-af99-691307ee6995</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>b673733a-b0f5-4632-8a3b-03b80969c0cd</id>
<id>cb364182-8573-4e81-ba62-2b4b51c86916</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>e63abb19-a8b0-4d26-9471-d6337fd446ff</id>
<id>d9485937-5af3-4473-b29a-4d128ce5640b</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>af12874d-79be-4998-b0b8-463e848afb34</id>
<id>049ac231-7597-4c56-b77c-6bd58561b417</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>4c76e206-b105-4223-9f8c-a37eed8e4fb9</id>
<id>7751cd2a-33a6-4a49-9218-ef5f2894d7e8</id>
<name>com.xyst.dinas.production.bill.ProductionPlanReport</name>
<title>生产管理</title>
<description>生产管理</description>
......
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>2aff0281-3377-44ef-8f1b-532fbb8e2ff5</id>
<id>167b168e-ccf2-4bad-9238-c7d4be23bfb8</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>10510a26-f6d9-4204-93aa-5f44d5823816</id>
<id>f7aa517f-288c-46a4-817b-86217d96a7a2</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>3ac2ffa1-64d6-4017-b811-a7f9bc51392c</id>
<id>a33d2eea-3dd0-47e6-b068-a6bb962e33f8</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>4ebf11bc-fc7a-4de1-a519-e61651859c6b</id>
<id>0eb52e1e-6394-4470-8b72-6c3d57d11e01</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>82b2e89f-ed36-46b8-8d3b-6ffd52d6a9d9</id>
<id>3a12e74f-4a5b-420d-9fd7-dfdc682bf787</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>4ad2ec60-7bab-4c90-a83a-db9b86a90156</id>
<id>a20836d3-7759-49b5-9ddd-ce7d66199761</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>73fe74a9-51ac-46fc-bb5f-6e3418a0c46b</id>
<id>2358dcde-b62b-407c-9530-dfafc4990d55</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>2cda0902-6c51-484f-bd6d-fc18bac70807</id>
<id>ccfa98a1-142f-47bd-b8c6-e11c72ca3b6d</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>6edb4731-8083-4ccd-a51f-f2d78c8724c5</id>
<id>b7c76c82-e150-41b8-a4bd-5186089d4549</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>5a95db2d-4f8c-4053-8a7e-7406f9fbf68a</id>
<id>b7c4e1c4-8eb1-452e-9ae9-7f0a756950dd</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>25504932-5e09-4e65-a2ae-635015f38947</id>
<id>0f515da2-b3a8-4690-82c4-38de3bbba947</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>874218ee-952c-45f7-8eb7-9341989dbb20</id>
<id>6bea76c0-4c26-48b9-b7c2-709f918e2864</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>15cfec21-137e-481a-b983-19c8f62170e8</id>
<id>342fb442-5021-468a-ab78-64f1106c1ef1</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>507911f2-b0a6-4cde-8ce7-de0cd878e081</id>
<id>27e9778a-9541-403d-ab4d-6fec6ef96bc7</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>e11b493c-5be4-4251-b6ba-f8d4fdffd5b3</id>
<id>ed5cfa63-c62d-4e1d-b579-6eff7b380fbd</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>40e4c497-c3c9-469b-8f98-0c37312a3194</id>
<id>54a3f01f-aa5e-4cca-bcce-61beb2705201</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>50c0b56c-09a6-452f-8da5-ec128e7fe86d</id>
<id>522e9bfe-58ab-4c3b-983d-48cadcffb207</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>18ee7669-40e6-4212-bf80-c1d62b5eccb2</id>
<id>aa84f5c8-980e-4ae4-b8cd-c52b6eb7050e</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>b18fceb3-630e-4139-b3a7-6b0a79aa23ee</id>
<id>218b0e77-9df3-4b13-ae1e-d5ce0dc62275</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>0be6009b-6bef-41df-99a0-dd810bc275a3</id>
<id>4259e13f-83f0-49bf-aecf-425483eaefd0</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>90a90083-b62a-4037-a807-45eca685b5c3</id>
<id>5c5dd65a-9764-44d1-8fdf-4b1f189e58d1</id>
<name>com.xyst.dinas.safe.bill.VehicleViolation</name>
<title>车辆违规记录</title>
<description>车辆违规记录</description>
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/CoefficientOrPriceDao.java
......@@ -20,4 +20,6 @@ public interface CoefficientOrPriceDao extends BaseDao {
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
......@@ -17,4 +17,6 @@ public interface VehicleAmountPartyDao extends BaseDao {
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/internal/dao/CoefficientOrPriceDaoImpl.java
......@@ -8,6 +8,7 @@ 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;
......@@ -109,6 +110,34 @@ public class CoefficientOrPriceDaoImpl extends AbstractBaseDao implements Coeffi
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
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/VehicleAmountPartyDaoImpl.java
......@@ -101,6 +101,16 @@ public class VehicleAmountPartyDaoImpl extends AbstractBaseDao implements Vehicl
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
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/CoefficientOrPriceServiceImpl.java
......@@ -117,4 +117,9 @@ public class CoefficientOrPriceServiceImpl implements CoefficientOrPriceService
}
}
@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
......@@ -2,6 +2,7 @@ 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.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.dao.StationDao;
import com.xyst.dinas.contract.internal.dao.ContractDao;
......@@ -89,6 +90,7 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
}
}catch (Exception e){
e.printStackTrace();
throw new Exception(e.toString());
}
......@@ -108,4 +110,26 @@ public class VehicleAmountPartyServiceImpl implements VehicleAmountPartyService
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
......@@ -18,4 +18,7 @@ public interface CoefficientOrPriceService {
//修改
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
......@@ -2,6 +2,8 @@ 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 org.springframework.web.multipart.MultipartException;
import java.util.List;
import java.util.UUID;
......@@ -13,4 +15,6 @@ public interface VehicleAmountPartyService {
Object queryByPaging(Page<KObject> objectPage, UUID purchaseSandUnitId, List<UUID> regionalCompanyIds) throws Exception ;
KObject getById(UUID id);
ResponseObj deleteById(UUID id) throws MultipartException;
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/CoefficientOrPriceController.java
......@@ -69,6 +69,17 @@ public class CoefficientOrPriceController {
}
@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");
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/VehicleAmountPartyController.java
......@@ -14,6 +14,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartException;
import java.math.BigDecimal;
import java.util.List;
......@@ -44,10 +45,10 @@ public class VehicleAmountPartyController {
return ResponseObj.error(400, "请选择具体的场站");
}
if (null == kobject.get("project").get("id")) {
return ResponseObj.error(400, "请选择具体的场站");
return ResponseObj.error(400, "请选择具体的项目");
}
if (null == kobject.get("purchaseSandUnit").get("id")) {
return ResponseObj.error(400, "请选择具体的项目");
return ResponseObj.error(400, "请选择具体的购砂单位");
}
if (null == kobject.get("contract").get("id")) {
return ResponseObj.error(400, "请选择具体的合同");
......@@ -140,6 +141,21 @@ public class VehicleAmountPartyController {
return ResponseObj.success("获取成功", discharging);
}
/**
* 根据Id删除车辆量方
* @param id
* @return
*/
@DeleteMapping("/{id}")
public ResponseObj deleteById(@PathVariable("id") UUID id) throws MultipartException{
if(id == null){
return ResponseObj.error(400,"'id' must be not null!");
}
return vehicleAmountPartyService.deleteById(id);
}
@GetMapping("/test")
public ResponseObj init(@RequestParam("id") String id) {
System.out.println("testok");
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/VehicleAmountPartyCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='811a31a1-d769-4598-8164-e45f28a829e0' category='销售/车辆量方（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/VehicleAmountPartyCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='e7e19316-d0ca-4da3-b028-6fcf87866ee8' category='销售/车辆量方（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/VehicleAmountPartyDelete.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyDelete</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='c3f897f6-3b36-4743-a330-34c2211a89ec' category='销售/车辆量方（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/VehicleAmountPartyList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartyList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='a2e36510-49d1-41ed-b8c4-04c493812135' category='销售/车辆量方（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/VehicleAmountPartySetting.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>VehicleAmountPartySetting</name>
<title>参数设置</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='87dd5f76-46b4-41e8-827b-714dd476c665' category='销售/车辆量方（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/VehicleAmountPartyCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>811a31a1-d769-4598-8164-e45f28a829e0</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/VehicleAmountPartyCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e7e19316-d0ca-4da3-b028-6fcf87866ee8</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/VehicleAmountPartyDelete.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>c3f897f6-3b36-4743-a330-34c2211a89ec</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyDelete</name>
<title>删除</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/VehicleAmountPartyList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>a2e36510-49d1-41ed-b8c4-04c493812135</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartyList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/VehicleAmountPartySetting.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>87dd5f76-46b4-41e8-827b-714dd476c665</id>
<name>com.xyst.dinas.sales.auth.VehicleAmountPartySetting</name>
<title>参数设置</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/车辆量方（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice$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>0f076b81-7ea4-4e42-a781-a63bc31d7837</id>
<id>68d3a930-9974-4e35-94f2-dcc2dfaf489f</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$sequence</name>
<title>折方系数$sequence</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice$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>5e7e2493-6154-446d-929f-c87da3daa169</id>
<id>81d6e952-40d2-4a78-b5e5-3dd216566adf</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice$serial</name>
<title>折方系数$serial</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/CoefficientOrPrice.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>e7a3dda7-581a-4011-b6aa-8e1a68107d6a</id>
<id>de9d506b-67c6-4df4-8c77-6e4922005003</id>
<name>com.xyst.dinas.sales.bill.CoefficientOrPrice</name>
<title>折方系数</title>
<description>折方系数</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$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>84395215-8daf-4e78-aa39-097cf01535d5</id>
<id>92788296-21b7-4b07-bf61-9b822766e1de</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$sequence</name>
<title>需用计划$sequence</title>
<description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan$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>e42322d9-5f5f-45e5-a692-0beccf712388</id>
<id>6e3275d0-4815-439d-ac7e-15562c0459bf</id>
<name>com.xyst.dinas.sales.bill.NeedPlan$serial</name>
<title>需用计划$serial</title>
<description>需用计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/NeedPlan.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>69d95754-2209-4a91-9ca2-7b0b25e3a21e</id>
<id>8e5c2061-42d0-45f7-ba0c-b9dd329a1c09</id>
<name>com.xyst.dinas.sales.bill.NeedPlan</name>
<title>需用计划</title>
<description>需用计划</description>
......
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