Skip to content

C
cloud-fb
Commit 9c4d371c by 王衍超
Options

解决冲突;

parents c5f9be09 3b3b6ecd
Showing with 495 additions and 56 deletions
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$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>bc8d9a39-a5ec-4b9e-99c5-0943cef8e89a</id>
<id>03289514-2cd9-4f20-b6f2-640700022bb7</id>
<name>com.xyst.dinas.biz.bill.Organization$sequence</name>
<title>组织机构$sequence</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$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>ba3c30a9-6740-4ef5-94bd-f7813a6b5a18</id>
<id>cc9774b0-18db-44ec-afc6-461e4456e51e</id>
<name>com.xyst.dinas.biz.bill.Organization$serial</name>
<title>组织机构$serial</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.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>d0afc8ec-00a9-441b-af1f-7dc0faacc8cb</id>
<id>88ea9c8c-042e-47be-810d-54daeb00f0e8</id>
<name>com.xyst.dinas.biz.bill.Organization</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>a3c621f0-ee3d-4d8c-894a-8490d569c8bf</id>
<id>250655ad-de26-47b0-a29c-1dcbedd37beb</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>9b4f79f2-10f6-4edf-86a6-01ff7fe1e87e</id>
<id>a1ae3e2e-1444-4ce1-8e05-8d80f7c8625f</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>1a14a0e5-9122-4080-ae05-428224dc321c</id>
<id>a4aeb03c-caec-48cd-9268-f9ae6deb9a4d</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>14b1baf2-6856-4fca-81a8-1cff30c4b73f</id>
<id>1a9827e1-2260-4d32-804e-dec3900edf6a</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>c0a6a1e2-dc8a-4815-ba00-1da4686ae544</id>
<id>a5888747-a71e-4b72-a71f-e9f6f048eec4</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>b97bf78e-b7cc-408c-a2fc-710d8fa02de8</id>
<id>c5053e70-b3e6-4604-9503-4c0d6e777b14</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>4d399e2e-b519-46a2-95c5-e720fe4473a7</id>
<id>353f3507-18ed-4fae-9cd8-fd19db50b688</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>aa047cf4-67d2-473b-8b94-081eacded787</id>
<id>9260f747-e1d2-4a02-863e-e37903d5ef54</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>f28290ba-9b0f-4a24-bfc2-7afcd5c97160</id>
<id>c563c7c9-5e2c-444c-a6bf-be4dbd2c266f</id>
<name>com.xyst.dinas.biz.bill.Station</name>
<title>场站</title>
<description>场站</description>
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java
......@@ -13,6 +13,7 @@ import com.beecode.inz.workflow.config.TriggerCondition;
import com.xyst.dinas.contract.constant.ContractConstant;
import com.xyst.dinas.contract.internal.dao.ContractInfoDao;
import com.xyst.dinas.contract.internal.service.ContractServiceImpl;
import com.xyst.dinas.contract.query.processor.PerformWarningProcessor;
import com.xyst.dinas.contract.service.ContractService;
import com.xyst.dinas.contract.web.ContractController;
/**
......@@ -58,4 +59,9 @@ public class ContractConfiguration {
configuration.setProcessConfiguration(processConfig);
return configuration;
}
@Bean("com.xyst.dinas.contract.query.processor.PerformWarningProcessor")
public PerformWarningProcessor performWarningProcessor() {
return new PerformWarningProcessor();
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/ContractDao.java 0 → 100644
package com.xyst.dinas.contract.internal.dao;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateOperations;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.contract.constant.ContractConstant;
public class ContractDao {
@Autowired
private HibernateOperations template;
public KObject load(UUID id) {
return (KObject) template.get(ContractConstant.ENTITY_CONTRACT, id);
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java
......@@ -74,6 +74,12 @@ public class ContractServiceImpl implements ContractService{
// BillData equipmentBillData = equipmentBill.getData();
}
@Override
public KObject queryContractById(UUID id) {
KObject kobject = contractInfoDao.load(id);
return kobject;
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/PerformWarningProcessor.java 0 → 100644
package com.xyst.dinas.contract.query.processor;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.query.entity.RowData;
import com.beecode.inz.query.processor.DataProcessor;
import com.beecode.inz.query.processor.DataProcessorContext;
import com.xyst.dinas.contract.service.ContractService;
public class PerformWarningProcessor implements DataProcessor {
@Autowired
private ContractService contractService;
@Override
public void process(DataProcessorContext context) {
List<RowData> rowDatas = context.getRowDatas();
for (RowData row : rowDatas) {
//合同,项目,购砂单位
UUID contractId = UUID.fromString(row.get("id").toString());
KObject contract = contractService.queryContractById(contractId);
row.put("projectName", contract.isNull("project") ? "" : contract.get("project").getString("name"));
row.put("contractName", contract.getString("contractName"));
row.put("purchaseSandUnitName", contract.getString("purchaseSandUnitName"));
}
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractPerformWarningService.java 0 → 100644
package com.xyst.dinas.contract.service;
public class ContractPerformWarningService {
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java
......@@ -27,4 +27,7 @@ public interface ContractService {
* @return
*/
JSONArray getProjectListByPurSandId(UUID purchaseSandId,UUID projectType,String projectName);
KObject queryContractById(UUID id);
}
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/datamodel/Contract.mk
......@@ -110,9 +110,14 @@
<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='contractId' columnName='contract_id' title='合同表ID' type='uuid' default='' precision='' isArray='false'>
<annotation id='00caecc1-35aa-4342-90c8-250f84609fe4' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'></annotation>
</attribute>
<attribute id='f780b924-bf9a-4786-96f1-50e89c26a26c' name='attId' columnName='att_id' title='附件id' type='uuid' default='' precision='' isArray='false'>
<annotation id='8218f944-40c1-468c-85af-530c5188d3ff' attributeId='bfac3d55-b94c-49b9-af31-8a7216f6ceea' name='length' value='undefined'>
</annotation>
</attribute>
<childModel id='57fa34cf-59f3-4be6-98bb-3e87853471ee' attributeId='06a76145-09c6-4e83-b91e-66aec616b9ca' refParentAttributeId='233c82e2-e7b6-49fc-96cc-bb947ba2cc99'
name='ContractDetail' tableName='xyst_dinas_contract_detail' domainInherit='' title='合同子表' >
name='contractDetail' tableName='xyst_dinas_contract_detail' domainInherit='' title='合同子表' >
<parent>com.beecode.bap.biztrait.datamodel.StoreSubTableRequirement</parent>
<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='contractId' columnName='contract_id' title='合同表ID' type='uuid' default='' precision='' isArray='false'>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/Contract.mk
......@@ -50,6 +50,15 @@
</ref>
<description></description>
</field>
<field title='项目名称'>
<name>project.projectName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司ID'>
<name>regionCompany.id</name>
......@@ -100,6 +109,11 @@
<type>string</type>
<description></description>
</field>
<field title='审批状态'>
<name>approveState</name>
<type>string</type>
<description></description>
</field>
<field title='收货地址'>
<name>addrReceive</name>
<type>string</type>
......@@ -170,6 +184,15 @@
<description></description>
</field>
<field title='创建时间'>
<name>createTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建人'>
<name>creator.name</name>
<type>string</type>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/WarningExe.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.contract.query</package>
<name>WarningExe</name>
<title>执行预警</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='7226bf7b-a061-4554-bef3-c7968b05fdba'>
<kclass>com.xyst.dinas.contract.datamodel.WarningExe</kclass>
<dataProcessor>com.xyst.dinas.contract.query.processor.PerformWarningProcessor</dataProcessor>
<innerScene title='全部'>
<id>fa6d9e0d-a774-4f90-b20a-b4b3d5b468a6</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>12cb7e87-edde-4447-ac5f-53fcd2bdc163</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='开始时间'>
<name>startTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='结束时间'>
<name>endTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='购砂单位'>
<name>purchaseSandUnitName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='项目名称'>
<name>projectName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='合同名称'>
<name>contractName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='预警指标'>
<name>target</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='实际值'>
<name>min</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建时间'>
<name>createTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='创建人'>
<name>creator.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改时间'>
<name>modifyTime</name>
<type>datetime</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='修改人'>
<name>modifier.name</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.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>8fb38300-8294-43f5-99b8-42fd1a45cbdb</id>
<id>e704ab51-1104-444a-888d-31761878c752</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>9f4808fa-6a5b-45a7-9945-409a61d8522e</id>
<id>3d8597bf-1d85-41c2-b5f6-17d44f8fca5d</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>52005496-bcfc-4787-b09b-375164114f82</id>
<id>76559dcc-3880-443e-ba58-0a3ab6606ce8</id>
<name>com.xyst.dinas.contract.bill.ContractBill</name>
<title>合同单据</title>
<description>合同单据</description>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract$ContractDetail.jmx → backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract$contractDetail.jmx
......@@ -2,7 +2,7 @@
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>57fa34cf-59f3-4be6-98bb-3e87853471ee</id>
<name>com.xyst.dinas.contract.datamodel.Contract$ContractDetail</name>
<name>com.xyst.dinas.contract.datamodel.Contract$contractDetail</name>
<title>合同子表</title>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/datamodel/Contract.jmx
......@@ -14,8 +14,8 @@
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>bcp.type.constraint.Numeric</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract$ContractDetail</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.xyst.dinas.contract.datamodel.Contract$contractDetail</dependency>
<dependency>com.xyst.dinas.project.datamodel.ProjectFiled</dependency>
<content>
<m:class>
......@@ -384,15 +384,24 @@
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>f780b924-bf9a-4786-96f1-50e89c26a26c</m:id>
<m:name>attId</m:name>
<m:title>附件id</m:title>
<m:type>uuid</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</m:type>
</m:annotation>
</m:annotations>
<m:id>06a76145-09c6-4e83-b91e-66aec616b9ca</m:id>
<m:name>ContractDetails</m:name>
<m:name>contractDetails</m:name>
<m:title>合同子表</m:title>
<m:type>com.xyst.dinas.contract.datamodel.Contract$ContractDetail[]</m:type>
<m:type>com.xyst.dinas.contract.datamodel.Contract$contractDetail[]</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/Contract.jmx
......@@ -60,6 +60,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.projectName</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>regionCompany.id</m:name>
<m:title>区域公司ID</m:title>
<m:type>uuid</m:type>
......@@ -130,6 +140,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>approveState</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>addrReceive</m:name>
<m:title>收货地址</m:title>
<m:type>string</m:type>
......@@ -260,6 +280,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/WarningExe.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>7226bf7b-a061-4554-bef3-c7968b05fdba</id>
<name>com.xyst.dinas.contract.query.WarningExe</name>
<title>执行预警</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.contract.datamodel.WarningExe</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.contract.datamodel.WarningExe</m:type>
<m:dataProcessor>com.xyst.dinas.contract.query.processor.PerformWarningProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>fa6d9e0d-a774-4f90-b20a-b4b3d5b468a6</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>12cb7e87-edde-4447-ac5f-53fcd2bdc163</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>startTime</m:name>
<m:title>开始时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>endTime</m:name>
<m:title>结束时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandUnitName</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>projectName</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>contractName</m:name>
<m:title>合同名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>target</m:name>
<m:title>预警指标</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>min</m:name>
<m:title>实际值</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/config/Contract.hbm.xml
......@@ -3,11 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.contract.datamodel.Contract" table="xyst_dinas_contract_master" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="uuid2" />
</id>
......@@ -42,7 +39,6 @@
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"></column>
</property>
<property name="contractId" type="uuid-binary" not-null="false">
<column name="contract_id" length="16"></column>
</property>
......@@ -76,8 +72,6 @@
<property name="contractState" type="nstring" not-null="false">
<column name="contract_state" length="50"></column>
</property>
<property name="addrReceive" type="nstring" not-null="false">
<column name="addr_receive" length="100"></column>
</property>
......@@ -126,16 +120,16 @@
<property name="valid" type="boolean" not-null="false">
<column name="valid" length="1"></column>
</property>
<property name="attId" type="uuid-binary" not-null="false" length="16">
<column name="att_id" not-null="false"></column>
</property>
<bag name="contractDetails" lazy="true" fetch="select" inverse="true">
<key column="master_id" not-null="true" />
<one-to-many entity-name="com.xyst.dinas.contract.datamodel.Contract$contractDetail" />
</bag>
</class>
<class entity-name="com.xyst.dinas.contract.datamodel.Contract$ContractDetail" table="xyst_dinas_contract_detail">
<class entity-name="com.xyst.dinas.contract.datamodel.Contract$contractDetail" table="xyst_dinas_contract_detail">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
......@@ -157,7 +151,5 @@
<property name="amount" type="big_decimal" not-null="false">
<column name="amount" precision="10" scale="2"></column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/resources/config/WarningExe.hbm.xml
......@@ -41,7 +41,21 @@
<property name="min" type="nstring" not-null="false">
<column name="min" length="100"></column>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"></column>
</property>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"></column>
</property>
<many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="creator_id" not-null="false"/>
</many-to-one>
<property name="modifyTime" type="timestamp" not-null="false">
<column name="modify_time"></column>
</property>
<many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="modifier_id" not-null="false"/>
</many-to-one>
</class>
</hibernate-mapping>
\ No newline at end of file
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>8b99fed2-9909-416e-b796-61bce8eb6c63</id>
<id>1a423785-7d06-436d-97b1-7e27cd52350a</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>47ebfa70-cf74-458d-9ffd-93c829e7cdac</id>
<id>671fc6fd-ecbb-4f34-a4c3-d4d10bb24955</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>003acde0-aaf1-44fd-91ee-e1588819492b</id>
<id>af5fdd89-5e0c-4f51-add8-25c115f4172a</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>42d9db44-0200-49ea-9c57-f1b5ada53183</id>
<id>9e8700a5-4ef2-4e99-a250-16a0171d9dc1</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>bd69df3d-fa95-4f50-8612-79f1ae487efe</id>
<id>6cf88b11-2027-4bb9-9ba4-f0986d0206dd</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>88978f1b-109b-4c65-9d92-10f18d3bd6f4</id>
<id>3b97edb4-5720-4987-baac-c58e61660d20</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>c3a6773c-b5e4-4746-a8c6-438434edc7cd</id>
<id>ce6095da-ec3e-4d47-849b-db18be1813d7</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>1153438f-22f2-40d7-a87b-15881e1fa265</id>
<id>abc634e6-0b4e-496d-a7a0-7de2b038c324</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>374c0efa-6954-4679-8561-5415920e0278</id>
<id>71c2ba25-eeda-4b39-90bc-a92ee528bb9f</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>2628bbcb-3529-4b96-a475-75c4ff8fe02f</id>
<id>64018504-1ad1-4ed4-87f8-9a9538a17d84</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>b012dabe-baae-4bd3-b32a-a076aa78b97e</id>
<id>dcbe7556-e9dc-4537-9d72-f7b1fd9f8129</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>28ea0206-30c7-4062-b100-3f826be962c8</id>
<id>9896f036-6336-4161-8080-8c6959ceec6a</id>
<name>com.xyst.dinas.oa.bill.UseCarApply</name>
<title>用车申请</title>
<description>用车申请</description>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$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>619a7df5-451a-4968-bf06-d0c556d929ff</id>
<id>76d88506-7763-4a46-a8f1-1a9a11eb2c91</id>
<name>com.xyst.dinas.project.bill.ProjectFiled$sequence</name>
<title>项目备案$sequence</title>
<description>项目备案</description>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$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>3dd15f46-81ce-43ea-a3fd-52a17d10465c</id>
<id>89ffbcc1-a82b-44ce-9982-347e92f46734</id>
<name>com.xyst.dinas.project.bill.ProjectFiled$serial</name>
<title>项目备案$serial</title>
<description>项目备案</description>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled.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>26095486-e958-4d9e-bd16-a649c177237c</id>
<id>a5080448-1691-4016-9cff-fe0345ed57e7</id>
<name>com.xyst.dinas.project.bill.ProjectFiled</name>
<title>项目备案</title>
<description>项目备案</description>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$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>6c6390e0-ce26-47cf-8d8a-586fa26f8f04</id>
<id>935632ad-fd13-4c5b-a659-b67dad5d40f3</id>
<name>com.xyst.dinas.project.bill.PurchaseSandCompany$sequence</name>
<title>购砂单位$sequence</title>
<description>购砂单位</description>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$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>1a5b9844-78c3-45dc-a1d4-df13ee4b73be</id>
<id>f2e2db54-d9fd-441f-a83b-005fe3fe08ab</id>
<name>com.xyst.dinas.project.bill.PurchaseSandCompany$serial</name>
<title>购砂单位$serial</title>
<description>购砂单位</description>
......
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany.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>2883b05c-9100-48f8-bfb3-2e9767555f6b</id>
<id>ca472cd6-c2a5-40fe-91b5-b3c22c68b04b</id>
<name>com.xyst.dinas.project.bill.PurchaseSandCompany</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