Skip to content

C
cloud-fb
Commit 2b37722e by 王衍超
Options

Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

parents bca0a163 7332f7d6
Showing with 3552 additions and 57 deletions
backend/inz.common/src/main/java/com/beecode/inz/common/util/DateTimeUtils.java
......@@ -307,9 +307,9 @@ public class DateTimeUtils {
/**
* 判断2个日期是否同月
* eg: isSameYear(2020-12-31,2021-01-01) false
* isSameYear(2020-12-31,2020-12-01) true
* isSameYear(2020-12-31,2021-12-01) true
* eg: isSameMonth(2020-12-31,2021-01-01) false
* isSameMonth(2020-12-31,2020-12-01) true
* isSameMonth(2020-12-31,2021-12-01) true
* @return Boolean
*/
public static Boolean isSameMonth(Date startDate , Date endDate) {
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/SandMiningAreaDao.java
......@@ -25,5 +25,5 @@ public interface SandMiningAreaDao extends BaseDao {
Object groupByDischarging(List<UUID> regionalCompanyIds);
List<KObject> ListByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude);
List<KObject> listByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude);
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/init/OrganizationDataInitializer.java
......@@ -53,7 +53,6 @@ public class OrganizationDataInitializer implements DataInitializer {
kObject.set(BaseConstants.CREATE_TIME, new Date());
dinasOrganizationService.save(kObject);
saveFollower(kObject);
dinasOrganizationService.createRelDepartment(kObject.getUuid("id"));
} else{
KObject organizationByName = dinasOrganizationService.queryOrganizationByName(kObject.getString("name"));
saveFollower(organizationByName);
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/SandMiningAreaDaoImpl.java
......@@ -92,6 +92,7 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
public Object groupByDischarging(List<UUID> regionalCompanyIds) {
DetachedCriteria detachedCriteria = getDetachedCriteria(regionalCompanyIds);
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("status", 2));
detachedCriteria.setProjection(Projections.projectionList()
.add(Projections.alias(Projections.sum("sandMiningQuantity"),"sandMiningQuantity"))
.add(Projections.alias(Projections.groupProperty("regionalCompany.id"),"regionalCompany")));
......@@ -100,11 +101,13 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
}
@Override
public List<KObject> ListByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude) {
public List<KObject> listByRegionalCompanyIds(List<UUID> regionalCompanyIds, Boolean isInclude) {
DetachedCriteria detachedCriteria = getDetachedCriteria(regionalCompanyIds);
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("status", 2));
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
if(!CollectionUtils.isEmpty(regionalCompanyIds)){
detachedCriteria.add(Restrictions.in("regionalCompany.id", regionalCompanyIds));
}
if(!isInclude){
detachedCriteria.add(Restrictions.in("sandMiningAreaType",
SandMiningAreaTypeEnum.ABANDONED_MINE_SAND.getValue(),
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java
......@@ -184,8 +184,9 @@ public class StationDaoImpl extends AbstractBaseDao implements StationDao, Stat
@Override
public List<KObject> queryStationByRegionalCompany(UUID id) {
return template.execute(session -> {
Query<KObject> query = session.createQuery(" from " + StationConstant.ENTITY + " where regionalCompany.id=:id ", KObject.class);
Query<KObject> query = session.createQuery(" from " + StationConstant.ENTITY + " where regionalCompany.id=:id and del=:del", KObject.class);
query.setParameter("id", id);
query.setParameter("del", false);
return query.getResultList();
});
}
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/SandMiningAreaServiceImpl.java
......@@ -4,6 +4,7 @@ import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.biz.dao.SandMiningAreaDao;
import com.xyst.dinas.biz.service.SandMiningAreaService;
import com.xyst.dinas.biz.warn.WarnSetting;
import com.xyst.dinas.biz.warn.WarnSettingConstant;
import com.xyst.dinas.biz.warn.WarnSettingEntity;
import com.xyst.dinas.biz.warn.WarnTargetTypeEnum;
......@@ -40,10 +41,7 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
@Override
public UUID addSandMiningArea(KObject kObject) {
UUID uuid = sandMiningAreaDao.create(kObject);
return uuid;
return sandMiningAreaDao.create(kObject);
}
private String getAreaWarningInfo(KObject kObject) {
......@@ -90,6 +88,9 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
@Override
public void deleteById(UUID id) {
sandMiningAreaDao.deleteById(id);
WarnSetting warnSetting = warningSettingService.getWarnSetting(WarnSettingConstant.SAND_MINING_AREA_BILL_TYPE, id, WarnSettingConstant.SAND_MINING_AREA_WARN_TARGET);
warningSettingService.deleteWarnSetting(warnSetting.getSettingId());
warningSettingService.endWarnStateBySettingId(warnSetting.getSettingId());
}
@Override
......@@ -103,7 +104,7 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
HashMap<String, Object> whereMap = new HashMap<>(1);
whereMap.put("status",2);
whereMap.put("del",false);
List<KObject> kObjects = sandMiningAreaDao.ListByRegionalCompanyIds (regionalCompanyIds,isInclude);
List<KObject> kObjects = sandMiningAreaDao.listByRegionalCompanyIds (regionalCompanyIds,isInclude);
List<HashMap<String,Object>> regionalCompanyList = new ArrayList<>();
HashMap<String, Object> regionalCompany;
HashMap<String, Object> temp = new HashMap<>(12);
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java
......@@ -124,7 +124,7 @@ public class ContractConfiguration {
}
@Bean
@Bean(ContractConstant.CONTRACT_LISTENER)
public ContractProcessEventListener createContractProcessEventListener() {
return new ContractProcessEventListener();
}
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/constant/ContractConstant.java
......@@ -58,7 +58,7 @@ public class ContractConstant {
/** 业务类型标题 */
public static final String BIZ_TITLE = "合同";
/** 流程监听器 */
public static final String CONTRACT_LISTENER = "com.xyst.dinas.contract.listene.ContractProcessEventListener";
public static final String CONTRACT_LISTENER = "com.xyst.dinas.contract.listener.ContractProcessEventListener";
/** 业务类型名称:合同变更 */
......@@ -66,7 +66,7 @@ public class ContractConstant {
/** 业务类型标题 */
public static final String BIZ_TITLE_UPDATE = "合同变更";
/** 流程监听器 */
public static final String CONTRACT_UPDATE_LISTENER = "com.xyst.dinas.contract.listene.ContractUpdateProcessListener";
public static final String CONTRACT_UPDATE_LISTENER = "com.xyst.dinas.contract.listener.ContractUpdateProcessListener";
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/listener/ContractProcessEventListener.java
......@@ -31,9 +31,15 @@ public class ContractProcessEventListener implements InzBizProcessEventListener
@Override
public void afterProcessCompleted(InzBizProcessEvent event) {
//自动新增合同预警条目
if(event.getInzBizProcess().getWorkflowState() == BizProcessState.DONE_WITH_AGREE.getValue()){
contractService.afterApprovedForInsert(event.getInzBizProcess().getBizDataObject());
if(event.getInzBizProcess().getTriggerAction().equals("SUBMIT")){
//自动新增合同预警条目
if(event.getInzBizProcess().getWorkflowState() == BizProcessState.DONE_WITH_AGREE.getValue()){
contractService.afterApprovedForInsert(event.getInzBizProcess().getBizDataObject());
}
}else if(event.getInzBizProcess().getTriggerAction().equals("CHANGE")){
if(event.getInzBizProcess().getWorkflowState() == BizProcessState.DONE_WITH_AGREE.getValue()){
contractService.afterApprovedForUpdate(event.getInzBizProcess().getBizDataObject());
}
}
}
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/Contract.mk
......@@ -170,6 +170,26 @@
<type>fixnum</type>
<description></description>
</field>
<field title='保证金余额'>
<name>depositBalance</name>
<type>fixnum</type>
<description></description>
</field>
<field title='预付款余额'>
<name>advanceBalance</name>
<type>fixnum</type>
<description></description>
</field>
<field title='销售总额'>
<name>saleAmount</name>
<type>fixnum</type>
<description></description>
</field>
<field title='销售总量'>
<name>saleDinasAmount</name>
<type>fixnum</type>
<description></description>
</field>
<field title='备注'>
<name>memo</name>
<type>string</type>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/ContractNoAuthFilterScene.mk
......@@ -164,6 +164,26 @@
<type>fixnum</type>
<description></description>
</field>
<field title='保证金余额'>
<name>depositBalance</name>
<type>fixnum</type>
<description></description>
</field>
<field title='预付款余额'>
<name>advanceBalance</name>
<type>fixnum</type>
<description></description>
</field>
<field title='销售总额'>
<name>saleAmount</name>
<type>fixnum</type>
<description></description>
</field>
<field title='销售总量'>
<name>saleDinasAmount</name>
<type>fixnum</type>
<description></description>
</field>
<field title='备注'>
<name>memo</name>
<type>string</type>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/Contract.jmx
......@@ -257,6 +257,46 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>depositBalance</m:name>
<m:title>保证金余额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>advanceBalance</m:name>
<m:title>预付款余额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>saleAmount</m:name>
<m:title>销售总额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>saleDinasAmount</m:name>
<m:title>销售总量</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>memo</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractNoAuthFilterScene.jmx
......@@ -250,6 +250,46 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>depositBalance</m:name>
<m:title>保证金余额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>advanceBalance</m:name>
<m:title>预付款余额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>saleAmount</m:name>
<m:title>销售总额</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>saleDinasAmount</m:name>
<m:title>销售总量</m:title>
<m:type>fixnum</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>memo</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
......
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/enumeration/RechargeStatusEnum.java 0 → 100644
package com.xyst.dinas.finance.enumeration;
/**
* 充值状态
*
*/
public enum RechargeStatusEnum {
ALREADY_ENTER_ACCOUNT("已入账", 0),
STAY_ENTER_ACCOUNT("待入账", 1);
String title;
int value;
RechargeStatusEnum(String title, int value){
this.title = title;
this.value = value;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public int getValue() {
return value;
}
public void setValue(int value) {
this.value = value;
}
}
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/bill/BankRechargeDetail.mk 0 → 100644
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.finance.bill</package>
<title>银行充值明细</title>
<name>BankRechargeDetail</name>
<description></description>
</header>
<content>
<bill>
<data>
{"baseData":{"name":"BankRechargeDetail","title":"银行充值明细","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"银行充值明细","dataModel":"com.xyst.dinas.finance.datamodel.BankRechargeDetail"},"serial":{"serialData":[{"segment":"literal","segmentData":"EM"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]}
</data>
</bill>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/bill/ExpenseAdjust.mk 0 → 100644
<model>
<header>
<type>bcp.biz.Bill</type>
<package>com.xyst.dinas.finance.bill</package>
<title>费用调整</title>
<name>ExpenseAdjust</name>
<description></description>
</header>
<content>
<bill>
<data>
{"baseData":{"name":"ExpenseAdjust","title":"费用调整","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"费用调整","dataModel":"com.xyst.dinas.finance.datamodel.ExpenseAdjust"},"serial":{"serialData":[{"segment":"literal","segmentData":"EM"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]}
</data>
</bill>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/datamodel/ArtificialRecharge.mk
......@@ -13,7 +13,7 @@
<dataModel id='12573eae-457e-4c67-a393-f30302f7b6c1' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_finance_artificial_recharge'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='12573eae-457e-4c67-a393-f30302f7b6c1' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<attribute id='0d0fd0c2-2697-4233-9862-148955ee8eb8' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='6d545db2-0dab-4f6d-936e-1b76a0553976' attributeId='a549dbc9-2b49-4334-851f-ee549760ff5b' name='length' value='undefined'>
</annotation>
<annotation id='c3fc93e1-525a-4b8a-a992-1c58011b03af' attributeId='9f95c060-edf9-4514-b10a-f0a477738093' name='mappingType' value='many-to-one'>
......
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/datamodel/BankRechargeDetail.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.finance.datamodel</package>
<title>银行充值明细</title>
<name>BankRechargeDetail</name>
<tags></tags>
<description>银行充值明细</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_finance_</tablePrefix>
</header>
<content>
<dataModel id='4214f5f3-69d4-4529-8778-80383e53d011' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_finance_bank_recharge_detail'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='b6a2837c-81f1-40a3-87c6-90701976be01' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='86b48f1f-4bf0-4f75-9968-dbaa05380fd1' attributeId='e938e464-cd2a-4c04-a41d-4db59b7ae658' name='length' value='undefined'>
</annotation>
<annotation id='af914df3-49e8-4e15-a18e-2fc82a90cb28' attributeId='5f1f570a-2800-40f5-bbc9-386fa9814d3b' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='aabc0b20-b024-4cc4-80e6-6578f8d189ba' name='project' columnName='project' title='项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
<annotation id='001d0a11-1f10-4f5a-97cf-032a09907b14' attributeId='cb8b5d86-d642-4515-82cc-e415f3d81407' name='length' value='undefined'>
</annotation>
<annotation id='dcc512a2-c43d-4541-8211-18d581a69f1d' attributeId='b51556b3-bd6a-42e2-a74d-90ec8b7d170c' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='5d72505c-42b3-4b61-a8a9-013375bf8bf3' name='contract' columnName='contract' title='合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='ed29c635-d000-4226-8476-cb861a4829fd' attributeId='9cbb9525-60bd-4e9f-8769-8798f71489a2' name='length' value='undefined'>
</annotation>
<annotation id='61d415ee-5f64-4a7d-8ad7-b04b28a7f7a8' attributeId='8ab67691-5df1-4899-954a-0793847a91ad' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='7cce3184-6650-407b-8970-ad6724c51bc5' name='purchaseSandUnit' columnName='purchase_sand_unit' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
<annotation id='78b10c59-70ee-4f6b-b2f1-0bf0b7f9e2fc' attributeId='19e0754a-2beb-4dea-97de-d23450481b3f' name='length' value='undefined'>
</annotation>
<annotation id='566199e9-6325-4d0e-84b4-6e17fe055cd7' attributeId='7d859af9-8ee8-4501-935e-d270ffe865d2' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='6b5b3645-124f-451f-8740-6a2dcceb8c46' name='rechargeAmount' columnName='recharge_amount' title='充值金额' type='fixnum' default='' precision='' isArray='false'>
<annotation id='64a25959-ff75-448f-8256-3edf90e09a04' attributeId='5e2b7822-f2d4-4fb5-a006-9016650de943' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='b1c02299-522c-4cd8-96c5-768bf26f5b3c' name='fundType' columnName='fund_type' title='资金类型' type='string' default='' precision='' isArray='false'>
<annotation id='275bffb4-7fea-4325-b186-e22b217b24a8' attributeId='a6afcb65-b571-44d6-a446-b49ab88e7803' name='length' value='100'>
</annotation>
</attribute>
<attribute id='d7d11649-1a00-42df-a78e-6a9fe151647e' name='rechargeStatus' columnName='recharge_status' title='充值状态' type='string' default='' precision='' isArray='false'>
<annotation id='6de3d80b-5951-4cc5-b5ed-e9b080e4e5a7' attributeId='cdf0ff65-bca9-4a61-8ad4-f5ec81245445' name='length' value='100'>
</annotation>
</attribute>
<attribute id='f809ff3e-6101-4afb-b73c-bdcf696f2a7d' name='bankName' columnName='bank_name' title='银行名称' type='string' default='' precision='' isArray='false'>
<annotation id='fa58210d-beae-44de-b3bd-6011d89fd14a' attributeId='0b5d79c7-d695-404a-b8fa-2685053e86af' name='length' value='100'>
</annotation>
</attribute>
<attribute id='d144e1d4-0375-4808-86f6-481efbeda4ae' name='paymentAccountNumber' columnName='payment_account_number' title='付款账号' type='string' default='' precision='' isArray='false'>
<annotation id='40e71e86-0f4b-423b-87b1-6aec059755f7' attributeId='bee6958b-0063-40aa-8057-dcc8788d7ee9' name='length' value='100'>
</annotation>
</attribute>
<attribute id='594a9f93-98f2-44a1-8f38-d00e1feeb849' name='shroffAccountNumber' columnName='shroff_account_number' title='收款账号' type='string' default='' precision='' isArray='false'>
<annotation id='ea5a0c31-5041-45ce-89a7-cca533df8d9f' attributeId='49a2baac-88d6-4d2e-a3ac-d8c980a586de' name='length' value='100'>
</annotation>
</attribute>
<attribute id='3c9cf5a1-6018-4dc3-9488-8a351376dbb0' name='remark' columnName='remark' title='备注' type='string' default='' precision='' isArray='false'>
<annotation id='2c7d9e9a-c300-4735-a93a-af0d933129b9' attributeId='8d2d156b-346e-4604-977f-2887dda677a1' name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.finance/src/main/resources/config/BankRechargeDetail.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/datamodel/ExpenseAdjust.mk 0 → 100644
<model>
<header>
<type>bcp.type.DataModel</type>
<package>com.xyst.dinas.finance.datamodel</package>
<title>费用调整</title>
<name>ExpenseAdjust</name>
<tags></tags>
<description>费用调整</description>
<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
<tablePrefix>xyst_dinas_finance_</tablePrefix>
</header>
<content>
<dataModel id='7a8403ab-5ccf-49db-8627-1a76cb112755' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_finance_expense_adjust'>
<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
<attribute id='149b500e-5b85-4996-9798-0c233221c3cb' name='regionalCompany' columnName='regional_company' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
<annotation id='bdf589d1-4784-49df-9d83-2a184ed8e329' attributeId='1363f0ba-ba8c-4fa7-a665-d399e848d28c' name='length' value='undefined'>
</annotation>
<annotation id='c9be928d-9d76-4f67-b0ad-1548629f044f' attributeId='99aa45ba-e660-4319-95e4-bbfcfe86ce6f' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='98d725bf-f614-47db-a301-51615d8b1fa0' name='project' columnName='project' title='项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
<annotation id='233b6699-a7ee-40bc-bc23-27f1a9d7a1f9' attributeId='32bfdf55-86a6-47f8-9d4a-06ee6736e6de' name='length' value='undefined'>
</annotation>
<annotation id='7eef87b3-3daf-4b86-ba8b-eb5f073c888f' attributeId='178adebd-7df4-43db-a84b-ec7f4c394fb7' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='d1e01bc6-46e5-4a30-bb04-4906776c61cd' name='contract' columnName='contract' title='合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
<annotation id='4831cbb8-3b67-409b-9bcf-928157fb1d47' attributeId='3c918496-36d7-494d-8eeb-7d534245c239' name='length' value='undefined'>
</annotation>
<annotation id='3399f602-f5c6-4a97-8a14-a3872146c915' attributeId='5566df75-4a82-4c58-a0f5-5397306e6395' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='d9c7a960-0aa8-4390-92b6-42f410a54c8f' name='purchaseSandUnit' columnName='purchase_sand_unit' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
<annotation id='cf251487-fb80-4831-aa19-221f9e9ae678' attributeId='324c2d11-65e0-4eed-b1cd-8ac721cabacb' name='length' value='undefined'>
</annotation>
<annotation id='c2e8e36f-39a4-4ad3-af1c-267fc9204c4b' attributeId='eb613cc2-9975-40f9-8d14-a672545546ea' name='mappingType' value='many-to-one'>
</annotation>
</attribute>
<attribute id='b1a24aa9-38a3-4753-825a-af3f08c564e5' name='fundType' columnName='fund_type' title='资金类型' type='string' default='' precision='' isArray='false'>
<annotation id='bd6ab03b-dd3b-4a18-a0e4-e194a4f4c2ff' attributeId='b414f6ce-6077-4dcd-91da-7de6ae39240f' name='length' value='100'>
</annotation>
</attribute>
<attribute id='2fbb7d8d-a528-47e1-8dcf-6c383117c09e' name='expenseAdjustAmount' columnName='expense_adjust_amount' title='费用调整金额' type='fixnum' default='' precision='' isArray='false'>
<annotation id='c36aa293-3bdb-49d9-8bf0-acafc9ccbf6c' attributeId='22048b3b-a06b-4014-81e4-bd73d63bbba6' name='length' value='undefined'>
</annotation>
</attribute>
<attribute id='a4f32ff1-4e2d-40b6-8b53-fca26055ebc2' name='remark' columnName='remark' title='备注' type='string' default='' precision='' isArray='false'>
<annotation id='8152789a-4800-41c4-8f6e-d35e8d124e3e' attributeId='206e3572-593c-4d81-bcad-8bfb57f7c6c2' name='length' value='500'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.finance/src/main/resources/config/ExpenseAdjust.hbm.xml</hibernate>
</dataModel>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ArtificialRecharge.mk
......@@ -9,7 +9,7 @@
</header>
<content>
<customQuery id='d87fb1b8-6583-40a8-a0d5-4fc8b26074c2'>
<kclass>com.xyst.dinas.finance.datamodel.FinanceRefund</kclass>
<kclass>com.xyst.dinas.finance.datamodel.ArtificialRecharge</kclass>
<dataProcessor></dataProcessor>
<authorityItem></authorityItem>
<innerScene title='全部'>
......
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/ExpenseAdjust.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.finance.query</package>
<name>ExpenseAdjust</name>
<title>费用调整</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='38f3b273-b445-4bb1-8294-b9dff81c8389'>
<kclass>com.xyst.dinas.finance.datamodel.ExpenseAdjust</kclass>
<dataProcessor></dataProcessor>
<authorityItem></authorityItem>
<innerScene title='全部'>
<id>389a4612-7383-4ef2-b125-66811c3f60bc</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>86e1b45e-1bc3-4016-8ca8-625032b953ef</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='权限过滤'>
<id>15e70b45-4845-47a1-b4dd-cbd311d61310</id>
<javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</javaImplement>
<defaultExecute>true</defaultExecute>
<hide>true</hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='区域公司name'>
<name>regionalCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='购砂单位'>
<name>purchaseSandCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='购砂单位name'>
<name>purchaseSandCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='项目'>
<name>project.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.ProjectFiled</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>contract.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.contract.datamodel.Contract</name>
</ref>
<description></description>
</field>
<field title='合同名称'>
<name>contract.contractName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='资金类型'>
<name>fundType</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='费用调整金额'>
<name>expenseAdjustAmount</name>
<type>float</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='备注'>
<name>remark</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>
<field title='废弃'>
<name>discard</name>
<type>boolean</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyst/dinas/finance/query/RankRechargeDetail.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.finance.query</package>
<name>BankRechargeDetail</name>
<title>银行充值明细</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='8e68e695-ed68-4e99-8c9a-da210f034f74'>
<kclass>com.xyst.dinas.finance.datamodel.BankRechargeDetail</kclass>
<dataProcessor></dataProcessor>
<authorityItem></authorityItem>
<innerScene title='全部'>
<id>4621b888-9df5-4f09-a32d-edbf09407320</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>266fdc42-bc0c-42f1-a0a7-1f1e6779c2f8</id>
<javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='权限过滤'>
<id>fc552bc3-f741-4fba-ac66-fc4b4ef27fe1</id>
<javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</javaImplement>
<defaultExecute>true</defaultExecute>
<hide>true</hide>
</innerScene>
<field title='id'>
<name>id</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='区域公司name'>
<name>regionalCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='购砂单位'>
<name>purchaseSandCompany.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='购砂单位name'>
<name>purchaseSandCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
</ref>
<description></description>
</field>
<field title='项目'>
<name>project.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.project.datamodel.ProjectFiled</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>contract.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.xyst.dinas.contract.datamodel.Contract</name>
</ref>
<description></description>
</field>
<field title='合同名称'>
<name>contract.contractName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='资金类型'>
<name>fundType</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='充值金额'>
<name>rechargeAmount</name>
<type>float</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='备注'>
<name>remark</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='银行名称'>
<name>bankName</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='付款账号'>
<name>paymentAccountNumber</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='收款账号'>
<name>shroffAccountNumber</name>
<type>string</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='充值状态'>
<name>rechargeStatus</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>
<field title='废弃'>
<name>discard</name>
<type>boolean</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
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>540858e5-b46f-407f-b2b3-1fa935acf4c1</id>
<id>e7be018f-9dd1-41a6-b030-a4ce6b2d4a36</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>c53cf548-19a7-4576-b80a-fdd76057a3bb</id>
<id>16e1cfd4-477e-48e3-9f14-27db4de6e520</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>7bfc74b9-cc09-437a-ab06-4d1aee686bf3</id>
<id>67218661-3b6d-490a-85bc-e26fe9890d5c</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 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>925011f2-be62-4adb-9dc5-000bc5e43d80</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$sequence</name>
<title>银行充值明细$sequence</title>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail$serial.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>7880e086-5187-41a8-bc4e-cbaa9b8b1bce</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail$serial</name>
<title>银行充值明细$serial</title>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.datamodel.BankRechargeDetail</dependency>
<dependency>com.xyst.dinas.finance.bill.BankRechargeDetail$sequence</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.finance.datamodel.BankRechargeDetail</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>EM</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.finance.bill.BankRechargeDetail$serial</m:key>
<m:sequenceName>com.xyst.dinas.finance.bill.BankRechargeDetail$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/BankRechargeDetail.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>6ae3320a-3ad9-4a6b-94df-aa87d4aa8eba</id>
<name>com.xyst.dinas.finance.bill.BankRechargeDetail</name>
<title>银行充值明细</title>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.bill.BankRechargeDetail$serial</dependency>
<dependency>com.xyst.dinas.finance.datamodel.BankRechargeDetail</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.finance.datamodel.BankRechargeDetail</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.finance.bill.BankRechargeDetail$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$sequence.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>5596be96-c074-41c6-a18f-0c8a77095255</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$sequence</name>
<title>费用调整$sequence</title>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust$serial.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>06f66fc3-f93a-418c-920f-4b5696c8524f</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust$serial</name>
<title>费用调整$serial</title>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.datamodel.ExpenseAdjust</dependency>
<dependency>com.xyst.dinas.finance.bill.ExpenseAdjust$sequence</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.finance.datamodel.ExpenseAdjust</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>EM</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.finance.bill.ExpenseAdjust$serial</m:key>
<m:sequenceName>com.xyst.dinas.finance.bill.ExpenseAdjust$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/bill/ExpenseAdjust.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>6a43a5e0-0c19-435c-b403-61618e6e271e</id>
<name>com.xyst.dinas.finance.bill.ExpenseAdjust</name>
<title>费用调整</title>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.datamodel.ExpenseAdjust</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<dependency>com.xyst.dinas.finance.bill.ExpenseAdjust$serial</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.finance.datamodel.ExpenseAdjust</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.finance.bill.ExpenseAdjust$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/datamodel/ArtificialRecharge.jmx
......@@ -61,7 +61,7 @@
</m:properties>
</m:annotation>
</m:annotations>
<m:id>12573eae-457e-4c67-a393-f30302f7b6c1</m:id>
<m:id>0d0fd0c2-2697-4233-9862-148955ee8eb8</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/datamodel/ExpenseAdjust.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>7a8403ab-5ccf-49db-8627-1a76cb112755</id>
<name>com.xyst.dinas.finance.datamodel.ExpenseAdjust</name>
<title>费用调整</title>
<description>费用调整</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<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>bcp.type.constraint.Numeric</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>
<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_finance_expense_adjust</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: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</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>149b500e-5b85-4996-9798-0c233221c3cb</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>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</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>98d725bf-f614-47db-a301-51615d8b1fa0</m:id>
<m:name>project</m:name>
<m:title>项目</m:title>
<m:type>com.xyst.dinas.project.datamodel.ProjectFiled</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<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</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>d1e01bc6-46e5-4a30-bb04-4906776c61cd</m:id>
<m:name>contract</m:name>
<m:title>合同</m:title>
<m:type>com.xyst.dinas.contract.datamodel.Contract</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<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</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>d9c7a960-0aa8-4390-92b6-42f410a54c8f</m:id>
<m:name>purchaseSandUnit</m:name>
<m:title>购砂单位</m:title>
<m:type>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>100</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>fund_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>b1a24aa9-38a3-4753-825a-af3f08c564e5</m:id>
<m:name>fundType</m:name>
<m:title>资金类型</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>bcp.type.constraint.Numeric</m:type>
<m:properties>
<m:property>
<m:key>precision</m:key>
<m:value>0</m:value>
</m:property>
<m:property>
<m:key>scale</m:key>
<m:value>0</m:value>
</m:property>
</m:properties>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>expense_adjust_amount</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>2fbb7d8d-a528-47e1-8dcf-6c383117c09e</m:id>
<m:name>expenseAdjustAmount</m:name>
<m:title>费用调整金额</m:title>
<m:type>fixnum</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<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>remark</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>a4f32ff1-4e2d-40b6-8b53-fca26055ebc2</m:id>
<m:name>remark</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ArtificialRecharge.jmx
......@@ -6,10 +6,10 @@
<title>人工充值</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.datamodel.FinanceRefund</dependency>
<dependency>com.xyst.dinas.finance.datamodel.ArtificialRecharge</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.finance.datamodel.FinanceRefund</m:type>
<m:type>com.xyst.dinas.finance.datamodel.ArtificialRecharge</m:type>
<m:dataProcessor></m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
......
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/BankRechargeDetail.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>8e68e695-ed68-4e99-8c9a-da210f034f74</id>
<name>com.xyst.dinas.finance.query.BankRechargeDetail</name>
<title>银行充值明细</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.datamodel.BankRechargeDetail</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.finance.datamodel.BankRechargeDetail</m:type>
<m:dataProcessor></m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>4621b888-9df5-4f09-a32d-edbf09407320</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>266fdc42-bc0c-42f1-a0a7-1f1e6779c2f8</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>fc552bc3-f741-4fba-ac66-fc4b4ef27fe1</m:id>
<m:title>权限过滤</m:title>
<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
<m:defaultExecute>true</m:defaultExecute>
<m:hide>true</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandCompany.id</m:name>
<m:title>购砂单位</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandCompany.name</m:name>
<m:title>购砂单位name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.id</m:name>
<m:title>项目</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</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>contract.id</m:name>
<m:title>合同</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.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>fundType</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>rechargeAmount</m:name>
<m:title>充值金额</m:title>
<m:type>float</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>remark</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>bankName</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>paymentAccountNumber</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>shroffAccountNumber</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>rechargeStatus</m:name>
<m:title>充值状态</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/query/ExpenseAdjust.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>38f3b273-b445-4bb1-8294-b9dff81c8389</id>
<name>com.xyst.dinas.finance.query.ExpenseAdjust</name>
<title>费用调整</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.finance.datamodel.ExpenseAdjust</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.finance.datamodel.ExpenseAdjust</m:type>
<m:dataProcessor></m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>389a4612-7383-4ef2-b125-66811c3f60bc</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>86e1b45e-1bc3-4016-8ca8-625032b953ef</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>15e70b45-4845-47a1-b4dd-cbd311d61310</m:id>
<m:title>权限过滤</m:title>
<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
<m:defaultExecute>true</m:defaultExecute>
<m:hide>true</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandCompany.id</m:name>
<m:title>购砂单位</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>purchaseSandCompany.name</m:name>
<m:title>购砂单位name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>project.id</m:name>
<m:title>项目</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</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>contract.id</m:name>
<m:title>合同</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contract.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>fundType</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>expenseAdjustAmount</m:name>
<m:title>费用调整金额</m:title>
<m:type>float</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>remark</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/config/BankRechargeDetail.hbm.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.finance.datamodel.BankRechargeDetail" table="xyst_dinas_finance_bank_recharge_detail" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"></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>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"></column>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"></column>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"></column>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"></column>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"></column>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false"></column>
</many-to-one>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project" not-null="false"></column>
</many-to-one>
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract" not-null="false"></column>
</many-to-one>
<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
<column name="purchase_sand_unit" not-null="false"/>
</many-to-one>
<property name="rechargeAmount" type="big_decimal" not-null="false">
<column name="recharge_amount" precision="12" scale="2"></column>
</property>
<property name="fundType" type="nstring" not-null="false">
<column name="fund_type" length="100"></column>
</property>
<property name="rechargeStatus" type="nstring" not-null="false">
<column name="recharge_status" length="100"></column>
</property>
<property name="bankName" type="nstring" not-null="false">
<column name="bank_name" length="100"></column>
</property>
<property name="paymentAccountNumber" type="nstring" not-null="false">
<column name="payment_account_number" length="100"></column>
</property>
<property name="shroffAccountNumber" type="nstring" not-null="false">
<column name="shroff_account_number" length="100"></column>
</property>
<property name="remark" type="nstring" not-null="false">
<column name="remark" length="500"></column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/resources/config/ExpenseAdjust.hbm.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.finance.datamodel.ExpenseAdjust" table="xyst_dinas_finance_expense_adjust" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"></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>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"></column>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"></column>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"></column>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"></column>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"></column>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false"></column>
</many-to-one>
<many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
<column name="project" not-null="false"></column>
</many-to-one>
<many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
<column name="contract" not-null="false"></column>
</many-to-one>
<many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
<column name="purchase_sand_unit" not-null="false"/>
</many-to-one>
<property name="fundType" type="nstring" not-null="false">
<column name="fund_type" length="100"></column>
</property>
<property name="expenseAdjustAmount" type="big_decimal" not-null="false">
<column name="expense_adjust_amount" precision="12" scale="2"></column>
</property>
<property name="remark" type="nstring" not-null="false">
<column name="remark" length="500"></column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.price/build.gradle
......@@ -20,7 +20,6 @@ dependencies {
compile project(":inz.basis")
compile project(":inz.authentication")
compile project(":xyst.dinas.biz")
compile project(":xyst.dinas.production")
compile project(":xyst.dinas.project")
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/dao/PriceAdjustmentDao.java
......@@ -22,4 +22,10 @@ public interface PriceAdjustmentDao extends BaseDao {
UUID creteDetails(KObject insertDetailKobject);
Page<KObject> listPriceAdjustmentInfoPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity);
List<KObject> getNewByStationId(UUID id);
List<KObject> getByStationId(UUID id);
List<KObject> getNewDetailsByStation(UUID id);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/entity/PriceAdjustmentSearchEntity.java
package com.xyst.dinas.price.entity;
import com.beecode.bap.attachment.common.Page;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
......@@ -13,9 +14,13 @@ public class PriceAdjustmentSearchEntity<T> extends Page<T> {
private Integer applyStatus;
private List<UUID> stationIds;
private List<UUID> regionalCompanyIds;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date adjustmentStartDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date adjustmentEndDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applyStartDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applyEndDate;
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java
......@@ -17,7 +17,9 @@ import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.hibernate5.HibernateTemplate;
import org.springframework.util.CollectionUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -33,6 +35,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
@Autowired
private DinasTypeDao dinasTypeDao;
@Override
public KObject load(UUID id) {
return (KObject) template.load(ENTITY, id);
......@@ -44,7 +47,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
if(null!=priceAdjustmentSearchEntity.getStationIds()){
if(!CollectionUtils.isEmpty(priceAdjustmentSearchEntity.getStationIds())){
detachedCriteria.add(Restrictions.in("station.id", priceAdjustmentSearchEntity.getStationIds()));
}
if(null!=priceAdjustmentSearchEntity.getAdjustmentStartDate()){
......@@ -59,7 +62,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
if(null!=priceAdjustmentSearchEntity.getApplyEndDate()){
detachedCriteria.add(Restrictions.le("applyDate", priceAdjustmentSearchEntity.getApplyEndDate()));
}
if(null!=priceAdjustmentSearchEntity.getRegionalCompanyIds()){
if(!CollectionUtils.isEmpty(priceAdjustmentSearchEntity.getRegionalCompanyIds())){
detachedCriteria.add(Restrictions.in("regionalCompany.id", priceAdjustmentSearchEntity.getRegionalCompanyIds()));
}
......@@ -75,6 +78,46 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
return priceAdjustmentSearchEntity;
}
@Override
public List<KObject> getNewByStationId(UUID id) {
KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
detachedCriteria.add(Restrictions.in("station.id", id));
detachedCriteria.add(Restrictions.eq("applyStatus",2 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
return byCriteria;
}
@Override
public List<KObject> getByStationId(UUID id) {
KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
detachedCriteria.add(Restrictions.in("station.id", id));
detachedCriteria.add(Restrictions.in("applyStatus",1,3 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
return byCriteria;
}
@Override
public List<KObject> getNewDetailsByStation(UUID id) {
KClass bean = Amino.getStaticMetadataContext().getBean(PriceAdjustmentConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
detachedCriteria.add(Restrictions.in("station.id", id));
detachedCriteria.add(Restrictions.in("applyStatus",1,3 ));
detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>)template.findByCriteria(detachedCriteria, 0, 1);
if(CollectionUtils.isEmpty(byCriteria)){
return null;
}
return Arrays.asList(byCriteria.get(0).get("dinasTypeDetails").toArray());
}
@Override
public void modify(KObject kobject) {
......@@ -94,8 +137,8 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
template.execute(session ->
{
Query query = session.createQuery("delete from " + PriceAdjustmentConstant.DETAIL_ENTITY +
" where master.id = :PriceAdjustmentId ");
query.setParameter("PriceAdjustmentId",priceAdjustmentId);
" as a where a.master.id = :priceAdjustmentId ");
query.setParameter("priceAdjustmentId",priceAdjustmentId);
return query.executeUpdate();
}
);
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java
......@@ -7,7 +7,10 @@ import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
import com.xyst.dinas.price.service.PriceAdjustmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Transactional(rollbackFor = Exception.class)
......@@ -25,6 +28,31 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
return priceAdjustmentDao.listPriceAdjustmentInfoPaging(priceAdjustmentSearchEntity);
}
@Override
public List<KObject> getNewByStations(List<UUID> ids) {
if(CollectionUtils.isEmpty(ids)){
return null;
}
List<KObject> kObjects = new ArrayList<>();
ids.forEach(id-> kObjects.addAll(priceAdjustmentDao.getNewByStationId(id)));
return kObjects;
}
@Override
public List<KObject> getNewDetailsByStation(UUID id) {
return priceAdjustmentDao.getNewDetailsByStation(id);
}
@Override
public KObject validateByStationId(UUID id) {
List<KObject> kObjects = priceAdjustmentDao.getByStationId(id);
if(CollectionUtils.isEmpty(kObjects)){
return null;
}
return kObjects.get(0);
}
@Override
public UUID addPriceAdjustment(KObject kObject) {
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/service/PriceAdjustmentService.java
package com.xyst.dinas.price.service;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
import java.util.Date;
import java.util.List;
import java.util.UUID;
......@@ -16,9 +13,15 @@ public interface PriceAdjustmentService {
KObject getById(UUID id);
void update(KObject kobject);
Object queryByPaging(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception;
List<KObject> getNewByStations(List<UUID> ids);
List<KObject> getNewDetailsByStation(UUID id);
KObject validateByStationId(UUID id);
}
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java
......@@ -9,6 +9,7 @@ import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.BaseConstants;
import com.beecode.util.DateUtil;
import com.fasterxml.jackson.databind.JsonNode;
import com.xyst.dinas.biz.service.DinasTypeService;
import com.xyst.dinas.price.constant.PriceAdjustmentConstant;
import com.xyst.dinas.price.entity.PriceAdjustmentSearchEntity;
import com.xyst.dinas.price.service.PriceAdjustmentService;
......@@ -29,16 +30,22 @@ public class PriceAdjustmentController {
@Autowired
private PriceAdjustmentService priceAdjustmentService;
@Autowired
private DinasTypeService dinasTypeService;
@RequestMapping(value = "/list/page", method = RequestMethod.GET)
public ResponseObj getListPage(@RequestBody PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception {
public ResponseObj getListPage(PriceAdjustmentSearchEntity<KObject> priceAdjustmentSearchEntity) throws Exception {
Page<KObject> objectPage = new Page<>();
objectPage.setPageNo(priceAdjustmentSearchEntity.getPageNo());
objectPage.setPageSize(priceAdjustmentSearchEntity.getPageSize());
return ResponseObj.success("查询成功", priceAdjustmentService.queryByPaging(priceAdjustmentSearchEntity));
}
@RequestMapping(value = "/getDinasTypeByStationId", method = RequestMethod.GET)
public ResponseObj getDinasTypeByStationId(@RequestParam("stationId") UUID stationId) {
return ResponseObj.success("查询成功", dinasTypeService.getByStation(stationId));
}
/**
* 新建价格调整
*
......@@ -82,8 +89,39 @@ public class PriceAdjustmentController {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject PriceAdjustment = priceAdjustmentService.getById(id);
return ResponseObj.success("获取成功", PriceAdjustment);
KObject priceAdjustment = priceAdjustmentService.getById(id);
return ResponseObj.success("获取成功", priceAdjustment);
}
/**
* 验证是否有最新审批中或者审批不通过的数据
*/
@GetMapping("validateByStationId")
public ResponseObj validateByStationId(@RequestParam("id") UUID id) {
if (id == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
KObject priceAdjustment = priceAdjustmentService.validateByStationId(id);
if(null!=priceAdjustment){
return ResponseObj.error("有正在审批或者未通过的数据,不可新建", priceAdjustment);
}
return ResponseObj.success("可以新增");
}
/**
* 获取最新的砂石价格
* @param ids id
* @return 获取成功
*/
@GetMapping("getNewByStations")
public ResponseObj getNewByStations(@RequestParam("ids") List<UUID> ids) {
if (ids == null) {
return ResponseObj.error(400, "'id' must be not null!");
}
List<KObject> priceAdjustment = priceAdjustmentService.getNewByStations(ids);
return ResponseObj.success("获取成功", priceAdjustment);
}
......
backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment$DinasTypeDetails.jmx
......@@ -35,6 +35,14 @@
<m:description/>
<m:default/>
</m:attribute>
<m:attribute>
<m:id>9be72556-d8a4-4427-9cad-23504d5ce84a</m:id>
<m:name>dinasOldPrice</m:name>
<m:title>原价</m:title>
<m:type>fixnum</m:type>
<m:description/>
<m:default/>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
......
backend/xyst.dinas.price/src/main/resources/com/xyst/dinas/price/datamodel/PriceAdjustment.jmx
......@@ -74,6 +74,25 @@
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>385cd381-5e31-412e-9031-ecb4f4cd382a</m:id>
<m:name>reason</m:name>
<m:title>调价原因</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>e0e06e29-2285-4f78-88d8-e3e5b940ba45</m:id>
<m:name>failureReason</m:name>
<m:title>不通过原因</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
......
backend/xyst.dinas.price/src/main/resources/config/PriceAdjustment.hbm.xml
......@@ -66,6 +66,16 @@
<comment>申请状态 0待审批 1审批中 2通过 3不通过</comment>
</column>
</property>
<property name="failureReason" type="nstring" not-null="false">
<column name="failureReason">
<comment>不通过原因</comment>
</column>
</property>
<property name="reason" type="nstring" not-null="false">
<column name="reason">
<comment>调价原因</comment>
</column>
</property>
<bag name="dinasTypeDetails" lazy="true" fetch="select" inverse="true">
<key column="master_id" not-null="true" />
<one-to-many entity-name="com.xyst.dinas.price.datamodel.PriceAdjustment$DinasTypeDetails" />
......@@ -76,7 +86,6 @@
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
<column name="dinas_type_id" not-null="true">
<comment>砂石类型id</comment>
......@@ -92,5 +101,10 @@
<comment>砂石价格</comment>
</column>
</property>
<property name="dinasOldPrice" type="big_decimal" not-null="false">
<column name="dinas_old_price" precision="12" scale="4">
<comment>砂石原价</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/DischargingServiceImpl.java
......@@ -96,7 +96,7 @@ public class DischargingServiceImpl implements DischargingService {
UUID uuid = dischargingDao.create(kObject);
//生成预警消息的逻辑 如果是小于当前年份的记录,不生成预警
Boolean ltYear = DateTimeUtils.isLtNowYear(dischargingTime);
if (ltYear) {
if (!ltYear) {
setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea);
}
return uuid;
......@@ -181,7 +181,10 @@ public class DischargingServiceImpl implements DischargingService {
KObject oldSandMiningArea = id.get("sandMiningArea");
UUID oldSandMiningAreaId = oldSandMiningArea.getUuid("id");
setWarningRecord(oldSandMiningAreaId, oldDischargingTime, oldSandMiningArea);
//如果采区和年都没有变化,则不判断旧的数据是否结束
if(oldSandMiningAreaId!=sandMiningAreaId&&!DateTimeUtils.isSameYear(oldDischargingTime,dischargingTime)){
setWarningRecord(oldSandMiningAreaId, oldDischargingTime, oldSandMiningArea);
}
if(!DateTimeUtils.isLtNowYear(dischargingTime)){
setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea);
}
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/ProductionPlanReportServiceImpl.java
......@@ -20,6 +20,8 @@ import org.apache.commons.collections.CollectionUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
@Transactional(rollbackFor = Exception.class)
......@@ -188,7 +190,11 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
dinasTypeDetailJson.put("stationName",stationName);
dinasTypeDetailJson.put("dinasTypeId",dinasTypeDetail.get("dinasType").getUuid("id").toString());
dinasTypeDetailJson.put("dinasTypeName",dinasTypeDetail.get("dinasType").getString("dinasTypeName"));
dinasTypeDetailJson.put("amount",dinasTypeDetail.getDouble("dinasWeight"));
BigDecimal dinasWeight = dinasTypeDetail.getBigDecimal("dinasWeight");
if(0==dinasWeight.compareTo(BigDecimal.ZERO)){
continue;
}
dinasTypeDetailJson.put("amount",dinasWeight);
strings.add(dinasTypeDetailJson);
}
params.put("data",strings);
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/config/SalesConfiguration.java
......@@ -2,11 +2,16 @@ 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;
import com.xyst.dinas.sales.internal.dao.InventoryDaoImpl;
import com.xyst.dinas.sales.internal.dao.NeedPlanDaoImpl;
import com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor;
import com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor;
import com.xyst.dinas.sales.internal.service.InventoryServiceImpl;
import com.xyst.dinas.sales.internal.service.NeedPlanServiceImpl;
import com.xyst.dinas.sales.internal.service.SalesPlanServiceImpl;
......@@ -89,4 +94,13 @@ public class SalesConfiguration {
return new NeedPlanDaoImpl();
}
@Bean("com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor")
public SalesPerformWarningProcessor performWarningProcessor() {
return new SalesPerformWarningProcessor();
}
@Bean("com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor")
public SalesWarnSettingProcessor salesWarnSettingProcessor() {
return new SalesWarnSettingProcessor();
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/query/processor/SalesPerformWarningProcessor.java 0 → 100644
package com.xyst.dinas.sales.internal.query.processor;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
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.biz.service.StationService;
import com.xyst.dinas.contract.service.ContractService;
public class SalesPerformWarningProcessor implements DataProcessor {
@Autowired
private StationService stationService;
@Override
public void process(DataProcessorContext context) {
List<RowData> rowDatas = context.getRowDatas();
for (RowData row : rowDatas) {
UUID stationId = UUID.fromString(row.get("billId").toString());
KObject station = stationService.getById(stationId);
row.put("stationName", station.getString("stationName"));
Assert.notNull(station, "找不到对应的场站!");
row.put("regionalCompanyName", station.get("regionalCompany").getString("name"));
}
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/query/processor/SalesWarnSettingProcessor.java 0 → 100644
package com.xyst.dinas.sales.internal.query.processor;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import com.beecode.bap.staff.service.StaffService;
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.biz.service.StationService;
import com.xyst.dinas.contract.service.ContractService;
/**
* 销售预警设置
*
*/
public class SalesWarnSettingProcessor implements DataProcessor {
@Autowired
private StationService stationService;
@Autowired
private StaffService staffService;
@Override
public void process(DataProcessorContext context) {
List<RowData> rowDatas = context.getRowDatas();
for (RowData row : rowDatas) {
//场站
UUID stationId = UUID.fromString(row.get("billId").toString());
KObject station = stationService.getById(stationId);
row.put("stationName", station.getString("stationName"));
Assert.notNull(station, "找不到对应的场站!");
String personnel = row.get("personnel") != null ? row.get("personnel").toString() : "";
String personnelName = "";
if (StringUtils.isNotEmpty(personnel)) {
List<String> personnelList = Arrays.asList(personnel.split(","));
for (int i = 0; i < personnelList.size(); i++) {
String personnelId = personnelList.get(i);
KObject personnelKObject = staffService.getById(UUID.fromString(personnelId));
if (i == personnelList.size() - 1) {
personnelName += personnelKObject.getString("name");
} else {
personnelName += personnelKObject.getString("name") + ",";
}
}
}
row.put("personnelName", personnelName);
}
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/InventoryServiceImpl.java
......@@ -138,7 +138,7 @@ public class InventoryServiceImpl implements InventoryService {
public void updateInventoryBaseInfo(UUID regionalCompany) {
List<StationDinasTypeRelation> relation = getStationAndDinasTypeRel(regionalCompany);
//根据最新的场站与砂石对应关系，更新库中的数据。添加新的砂石类型，废弃没用的砂石类型
//根据最新的区域公司与砂石对应关系，更新库中的数据。添加新的砂石类型，废弃没用的砂石类型
List<KObject> inventory = inventoryDao.listAllByRegionalCompany(regionalCompany, true);
for(StationDinasTypeRelation r : relation) {
UUID stationId = r.getStationId();
......@@ -192,8 +192,9 @@ public class InventoryServiceImpl implements InventoryService {
List<KObject> stationList;
try {
stationList = stationService.listStationInfoByRegionalCompany(regionalCompany);
//根据场站查砂石类型改成根据区域公司查砂石类型，默认每个场站都会卖这些砂石类型，把对应关系全部维护起来。
List<KObject> dinasTypeList = dinasTypeService.getByRegionalCompanyId(regionalCompany);
for(KObject station : stationList) {
List<KObject> dinasTypeList = dinasTypeService.getByStation(station.getUuid("id"));
//TODO：带出今日砂价
for(KObject dinasType : dinasTypeList) {
StationDinasTypeRelation item = new StationDinasTypeRelation(station.getUuid("id"), dinasType.getUuid("id"), new BigDecimal(0));
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlan.mk
......@@ -39,7 +39,7 @@
</ref>
<description></description>
</field>
<field title='区域公司'>
<field title='区域公司id'>
<name>regionalCompany.id</name>
<type>uuid</type>
<ref>
......@@ -48,6 +48,15 @@
</ref>
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='计划周期'>
<name>planningCycle.id</name>
<type>uuid</type>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesPlanTemp.mk
......@@ -39,7 +39,7 @@
</ref>
<description></description>
</field>
<field title='区域公司'>
<field title='区域公司id'>
<name>regionalCompany.id</name>
<type>uuid</type>
<ref>
......@@ -48,6 +48,15 @@
</ref>
<description></description>
</field>
<field title='区域公司'>
<name>regionalCompany.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
</ref>
<description></description>
</field>
<field title='计划周期'>
<name>planningCycle.id</name>
<type>uuid</type>
......
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/query/SalesWarnSetting.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>SalesWarnSetting</name>
<title>销售预警设置</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='c0fb04e4-3ea7-4374-aa12-96614d7d0231'>
<kclass>com.xyst.dinas.biz.datamodel.WarnSetting</kclass>
<dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor</dataProcessor>
<innerScene title='全部'>
<id>5c728238-45ed-42b4-bc66-be4ecce84609</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>127aa3f5-1a4c-488b-9530-c890d5c8460b</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='version'>
<name>version</name>
<type>int</type>
<description></description>
</field>
<field title='业务id'>
<name>billId</name>
<type>uuid</type>
<ref>
<type></type>
<name></name>
</ref>
<description></description>
</field>
<field title='业务类型'>
<name>billType</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>memo</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>personnel</name>
<type>string</type>
<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.sales/src/main/model/com/xyst/dinas/sales/query/SalesWarningExe.mk 0 → 100644
<model>
<header>
<type>inz.query.Query</type>
<package>com.xyst.dinas.sales.query</package>
<name>SalesWarningExe</name>
<title>执行预警</title>
<tags></tags>
<description></description>
</header>
<content>
<customQuery id='62ee19e3-374c-4954-bcb8-eab78f76dd1f'>
<kclass>com.xyst.dinas.biz.datamodel.WarningExe</kclass>
<dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor</dataProcessor>
<innerScene title='全部'>
<id>a9e6e14f-0f08-433f-a5d8-034dde8aee93</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<defaultExecute></defaultExecute>
<hide></hide>
</innerScene>
<innerScene title='已废弃'>
<id>54a50515-f9e9-4f19-94db-d34424cf7f4b</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='业务id'>
<name>billId</name>
<type>uuid</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>memo</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>actualValue</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.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanAdvQuery.jmx
......@@ -12,6 +12,7 @@
<sql-type>SQL</sql-type>
<sql>
SELECT
salesPlan.id AS id,
xystorganization.NAME AS organization,
planningCycle.title AS planningCycleTitle,
projectFiled.projectName AS projectName,
......@@ -25,7 +26,9 @@
LEFT JOIN PlanningCycle AS planningCycle ON planningCycle.id = salesPlan.planningCycle
LEFT JOIN NeedPlan AS needPlan ON needPlan.planningCycle = salesPlan.planningCycle
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = needPlan.project UNION
WHERE ( salesPlan.DISCARD = FALSE OR salesPlan.DISCARD IS NULL )
SELECT
salesPlanTemp.id AS id,
xystorganizationrTemp.NAME AS organization,
planningCycleTemp.title AS planningCycleTitle,
projectFiledTemp.projectName AS projectName,
......@@ -39,6 +42,7 @@
LEFT JOIN PlanningCycleTemp AS planningCycleTemp ON planningCycleTemp.id = salesPlanTemp.planningCycle
LEFT JOIN ProjectFiledTemp AS projectFiledTemp ON projectFiledTemp.id = salesPlanTemp.project
LEFT JOIN NeedPlanTemp AS needPlanTemp ON needPlanTemp.planningCycle = salesPlanTemp.planningCycle
WHERE ( salesPlanTemp.DISCARD = FALSE OR salesPlanTemp.DISCARD IS NULL )
</sql>
</template>
</content>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanDetailAdvQuery.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>9fb8ea1b-b04b-4876-815a-1337272e9863</id>
<name>com.xyst.dinas.sales.advanquery.SalesPlanDetailAdvQuery</name>
<title>销售计划分析</title>
<description>销售计划分析</description>
<define>advanced.query.template</define>
<define-version>1.0</define-version>
<content>
<template>
<sql-type>SQL</sql-type>
<sql>
SELECT
salesPlanDetail.id AS id,
dinasType.name AS dinasTypeName,
salesPlanDetail.requiredAmount AS requiredAmount,
salesPlanDetail.planAmount AS planAmount,
salesPlanDetail.actualSaleAmount AS actualSaleAmount
FROM
NeedPlan$NeedPlanDetail AS salesPlanDetail
LEFT JOIN DinasType AS dinasType ON dinasType.id = salesPlanDetail.dinasType
WHERE salesPlanDetail.masterId = :?billId
</sql>
</template>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanDetailQueryView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification>
<id>d6ba7ca3-e79d-43b1-b414-26cf7a96f194</id>
<name>com.xyst.dinas.sales.advanquery.SalesPlanDetailQueryView</name>
<title>销售计划分析</title>
<description>销售计划分析</description>
<define>advanced.query.view</define>
<define-version>1.0</define-version>
<content>
<view>
{
"name": "销售计划分析详情",
"title": "销售计划分析详情",
"description": "销售计划分析详情",
"actions": [],
"scenes" : {
"isShowScenes" : true
},
"fuzzySearch": [
],
"isShowTabCountZero": true,
"groups": [
{
"name": "all",
"title": "全部",
"content": {
"datasource": "com.xyst.dinas.sales.advanquery.SalesPlanDetailAdvQuery"
}
}
],
"content": {
"isShowView": "table",
"datasource": "com.xyst.dinas.sales.advanquery.SalesPlanDetailAdvQuery",
"arguments": {
"items": [
]
},
"actions": [
{
"param": [],
"enable": "ALL",
"name": "query_export",
"action": "query_export",
"title": "导出",
"type": ""
},
{
"name": "queryRefresh",
"title": "刷新",
"action": "queryRefresh",
"param": [],
"type": "",
"enable": "ALL"
}
],
"table": {
"selectType": "MULTI",
"serialNumber": "series",
"pageSize": 200,
"orders":[
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "砂石种类",
"key": "dinasTypeName",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "需用计划量（吨）",
"key": "requiredAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "销售计划量（吨）",
"key": "PlanAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "实际运输量（吨）",
"key": "actualSaleAmount",
"columnType": {
"name": "select",
"data": {
"selected": true
}
}
}
]
}
}
}
</view>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx
......@@ -63,6 +63,17 @@
],
"expand": false,
"columns": [
{
"type": "VALUE",
"title": "id",
"key": "id",
"columnType": {
"name" : "inner",
"data": {
"selected": true
}
}
},
{
"type": "VALUE",
"title": "区域公司",
......@@ -150,8 +161,7 @@
"title" : "详情",
"action" : "openDetail",
"param" : {
"viewName" : "123",
"billId" : "id"
"modelName" : "123"
},
"type" : ""
} ],
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlan.jmx
......@@ -48,7 +48,7 @@
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司</m:title>
<m:title>区域公司id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
......@@ -57,6 +57,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.id</m:name>
<m:title>计划周期</m:title>
<m:type>uuid</m:type>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesPlanTemp.jmx
......@@ -48,7 +48,7 @@
</m:field>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司</m:title>
<m:title>区域公司id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
......@@ -57,6 +57,16 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>planningCycle.id</m:name>
<m:title>计划周期</m:title>
<m:type>uuid</m:type>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/query/SalesWarnSetting.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>c0fb04e4-3ea7-4374-aa12-96614d7d0231</id>
<name>com.xyst.dinas.sales.query.SalesWarnSetting</name>
<title>销售预警设置</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.WarnSetting</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.biz.datamodel.WarnSetting</m:type>
<m:dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesWarnSettingProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>5c728238-45ed-42b4-bc66-be4ecce84609</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>127aa3f5-1a4c-488b-9530-c890d5c8460b</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>version</m:name>
<m:title>version</m:title>
<m:type>int</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>billId</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>billType</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>memo</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>personnel</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.sales/src/main/resources/com/xyst/dinas/sales/query/SalesWarningExe.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>62ee19e3-374c-4954-bcb8-eab78f76dd1f</id>
<name>com.xyst.dinas.sales.query.SalesWarningExe</name>
<title>销售预警</title>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.biz.datamodel.WarningExe</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.biz.datamodel.WarningExe</m:type>
<m:dataProcessor>com.xyst.dinas.sales.internal.query.processor.SalesPerformWarningProcessor</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScene>
<m:id>a9e6e14f-0f08-433f-a5d8-034dde8aee93</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>54a50515-f9e9-4f19-94db-d34424cf7f4b</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>billId</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>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>memo</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>actualValue</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.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportCompany$sequence.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification>
<id>b87432ed-d086-4995-b9dc-3d604f00de66</id>
<name>com.xyst.dinas.transport.bill.TransportCompany$sequence</name>
<title>运输公司备案$sequence</title>
<description>运输公司备案</description>
<define>bcp.sequence</define>
<define-version>1.0</define-version>
<content>
<m:sequence>
<m:start-with>0</m:start-with>
<m:increment>1</m:increment>
<m:max>99999</m:max>
<m:min>0</m:min>
<m:cycle>true</m:cycle>
<m:cache-size>10</m:cache-size>
</m:sequence>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportCompany$serial.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification>
<id>131a671d-1c01-4bd8-8f7e-b78af96adf5f</id>
<name>com.xyst.dinas.transport.bill.TransportCompany$serial</name>
<title>运输公司备案$serial</title>
<description>运输公司备案</description>
<define>bcp.serial</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.transport.datamodel.TransportCompany</dependency>
<dependency>com.xyst.dinas.transport.bill.TransportCompany$sequence</dependency>
<content>
<m:serial>
<m:input>com.xyst.dinas.transport.datamodel.TransportCompany</m:input>
<m:functionLibrarys/>
<m:segments>
<m:literal>
<m:value>VV</m:value>
</m:literal>
<m:sequence>
<m:length>5</m:length>
<m:pad-direction>left</m:pad-direction>
<m:pad-string>0</m:pad-string>
<m:key>com.xyst.dinas.transport.bill.TransportCompany$serial</m:key>
<m:sequenceName>com.xyst.dinas.transport.bill.TransportCompany$sequence</m:sequenceName>
</m:sequence>
</m:segments>
</m:serial>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/TransportCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification>
<id>961d0f77-5b93-4962-aa6a-38771cb27807</id>
<name>com.xyst.dinas.transport.bill.TransportCompany</name>
<title>运输公司备案</title>
<description>运输公司备案</description>
<define>bcp.biz.Biztype</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.transport.bill.TransportCompany$serial</dependency>
<dependency>com.xyst.dinas.transport.datamodel.TransportCompany</dependency>
<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
<content>
<m:biztype>
<m:type>com.xyst.dinas.transport.datamodel.TransportCompany</m:type>
<m:inheritances>
<m:inheritance>
<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
<m:config type="xml">
<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.transport.bill.TransportCompany$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
</m:config>
</m:inheritance>
</m:inheritances>
<m:methodAuthorityItems/>
</m:biztype>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/datamodel/TransportCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
<specification>1.0</specification>
<id>e0e06e29-2285-4f78-88d8-e3e5b940ba45</id>
<name>com.xyst.dinas.transport.datamodel.TransportCompany</name>
<title>运输公司备案</title>
<description>运输公司备案</description>
<define>bcp.type.Class</define>
<define-version>1.0</define-version>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<content>
<m:class>
<m:parents>
<m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
</m:parents>
<m:attributes>
<m:attribute>
<m:annotations/>
<m:id>385cd381-5e31-412e-9031-ecb4f4cd382a</m:id>
<m:name>regionalCompany</m:name>
<m:title>区域公司</m:title>
<m:type>com.xyst.dinas.biz.datamodel.xystOrganization</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>9be72556-d8a4-4427-9cad-23504d5ce84a</m:id>
<m:name>companyName</m:name>
<m:title>公司名称</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>d3286a16-0534-4d39-9657-ccd88ceb6e1d</m:id>
<m:name>businessLicense</m:name>
<m:title>营业执照</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>8e841e01-6f40-4052-ae19-49274828e3ec</m:id>
<m:name>linkMan</m:name>
<m:title>联系人</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:id>a505f0f9-a1f7-4669-8a72-0329b60173e0</m:id>
<m:name>contactDetails</m:name>
<m:title>联系方式</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes>
</m:class>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/datamodel/VehicleViolation.jmx
......@@ -9,10 +9,8 @@
<define-version>1.0</define-version>
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.SubTableAnnotation</dependency>
<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
<dependency>com.xyst.dinas.biz.datamodel.xystOrganization</dependency>
<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<content>
<m:class>
......
backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/query/TransportCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
<specification>1.0</specification>
<id>152d05b0-01ee-4933-9a7c-8866894c118d</id>
<name>com.xyst.dinas.transport.query.TransportCompany</name>
<title>运输公司备案</title>
<description>运输公司备案</description>
<define>inz.query.Query</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.transport.datamodel.TransportCompany</dependency>
<content>
<m:query>
<m:type>com.xyst.dinas.transport.datamodel.TransportCompany</m:type>
<m:dataProcessor></m:dataProcessor>
<m:innerScenes>
<m:innerScene>
<m:id>b98f6ad2-cb60-4996-8ad3-80a637a27dea</m:id>
<m:title>全部</m:title>
<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>ab5f4830-670a-4a24-b730-9c57a68fff13</m:id>
<m:title>已废弃</m:title>
<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
<m:defaultExecute></m:defaultExecute>
<m:hide></m:hide>
</m:innerScene>
<m:innerScene>
<m:id>f9fff8dd-8bf5-47d1-8a94-d206b740677c</m:id>
<m:title>权限过滤</m:title>
<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
<m:defaultExecute>true</m:defaultExecute>
<m:hide>true</m:hide>
</m:innerScene>
</m:innerScenes>
<m:fields>
<m:field>
<m:name>regionalCompany.id</m:name>
<m:title>区域公司</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>regionalCompany.name</m:name>
<m:title>区域公司name</m:title>
<m:type>string</m:type>
<m:ref>
<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>id</m:name>
<m:title>id</m:title>
<m:type>uuid</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>companyName</m:name>
<m:title>公司名称</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>businessLicense</m:name>
<m:title>营业执照</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>linkMan</m:name>
<m:title>联系人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>contactDetails</m:name>
<m:title>联系方式</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>createTime</m:name>
<m:title>创建时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>creator.name</m:name>
<m:title>创建人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifyTime</m:name>
<m:title>修改时间</m:title>
<m:type>datetime</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>modifier.name</m:name>
<m:title>修改人</m:title>
<m:type>string</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>discard</m:name>
<m:title>废弃</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>del</m:name>
<m:title>删除</m:title>
<m:type>boolean</m:type>
<m:ref>
<m:name></m:name>
<m:type></m:type>
</m:ref>
<m:desc></m:desc>
</m:field>
</m:fields>
</m:query>
</content>
</metadata>
backend/xyst.dinas.transport/src/main/resources/config/TransportCompany.hbm.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
<class entity-name="com.xyst.dinas.transport.datamodel.TransportCompany" table="xyst_dinas_transport_company" optimistic-lock="version">
<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer" />
<id name="id" type="uuid-binary" column="id" length="16">
<generator class="assigned" />
</id>
<version name="version" type="int" column="version"/>
<property name="createTime" type="timestamp" not-null="false">
<column name="create_time"/>
</property>
<many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="creator_id" not-null="false"/>
</many-to-one>
<property name="modifyTime" type="timestamp" not-null="false">
<column name="modify_time"/>
</property>
<many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
<column name="modifier_id" not-null="false"/>
</many-to-one>
<property name="billState" type="nstring" not-null="false">
<column name="bill_state" length="100"/>
</property>
<many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
<column name="biz_process_id" not-null="false"/>
</many-to-one>
<property name="billCode" type="nstring" not-null="false">
<column name="bill_code" length="200"/>
</property>
<property name="discard" type="boolean" not-null="false">
<column name="discard"/>
</property>
<property name="del" type="boolean" not-null="false">
<column name="del"/>
</property>
<property name="approveState" type="integer" not-null="false">
<column name="approve_state"/>
</property>
<many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
<column name="regional_company" not-null="false">
<comment>所属组织机构</comment>
</column>
</many-to-one>
<property name="companyName" type="nstring" not-null="true">
<column name="company_name" length="13">
<comment>公司名称</comment>
</column>
</property>
<property name="businessLicense" type="nstring" not-null="false">
<column name="business_license" length="100">
<comment>营业执照</comment>
</column>
</property>
<property name="linkMan" type="nstring" not-null="false">
<column name="link_man" length="100">
<comment>联系人</comment>
</column>
</property>
<property name="contactDetails" type="nstring" not-null="false">
<column name="contact_details" length="100">
<comment>联系方式</comment>
</column>
</property>
</class>
</hibernate-mapping>
\ No newline at end of file
backend/xyst.dinas.transport/src/main/resources/config/VehicleViolation.hbm.xml
......@@ -51,18 +51,18 @@
</column>
</property>
<property name="plateNumber" type="nstring" not-null="true">
<column name="plateNumber" length="11">
<column name="plate_number" length="11">
<comment>车牌号</comment>
</column>
</property>
<property name="description" type="nstring" not-null="true">
<property name="description" type="nstring" not-null="false">
<column name="description" length="1000">
<comment>违规描述</comment>
</column>
</property>
<property name="processResult" type="nstring" not-null="true">
<property name="processResult" type="nstring" not-null="false">
<column name="process_result" length="1000">
<comment>违规处理结果</comment>
</column>
......
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