Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王衍超
cloud-fb
Commits
308cf05f
Commit
308cf05f
authored
Apr 09, 2021
by
王衍超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同预警完善;
parent
c049c2ab
Show whitespace changes
Inline
Side-by-side
Showing
43 changed files
with
142 additions
and
47 deletions
+142
-47
WarnSetting.java
...iz/src/main/java/com/xyst/dinas/biz/warn/WarnSetting.java
+2
-0
WarnSettingEntity.java
.../main/java/com/xyst/dinas/biz/warn/WarnSettingEntity.java
+9
-0
WarnTargetTypeEnum.java
...main/java/com/xyst/dinas/biz/warn/WarnTargetTypeEnum.java
+57
-0
WarnSetting.mk
...rc/main/model/com/xyst/dinas/biz/datamodel/WarnSetting.mk
+3
-0
Organization$sequence.jmx
...sources/com/xyst/dinas/biz/bill/Organization$sequence.jmx
+1
-1
Organization$serial.jmx
...resources/com/xyst/dinas/biz/bill/Organization$serial.jmx
+1
-1
Organization.jmx
...c/main/resources/com/xyst/dinas/biz/bill/Organization.jmx
+1
-1
Position$sequence.jmx
...n/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
+1
-1
Position$serial.jmx
...ain/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
+1
-1
Position.jmx
...z/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
+1
-1
ShipInfo$sequence.jmx
...n/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
+1
-1
ShipInfo$serial.jmx
...ain/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
+1
-1
ShipInfo.jmx
...z/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
+1
-1
Station$sequence.jmx
...in/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
+1
-1
Station$serial.jmx
...main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
+1
-1
Station.jmx
...iz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
+1
-1
WarnSetting.jmx
...in/resources/com/xyst/dinas/biz/datamodel/WarnSetting.jmx
+14
-0
WarnSetting.hbm.xml
...t.dinas.biz/src/main/resources/config/WarnSetting.hbm.xml
+3
-0
ContractServiceImpl.java
.../dinas/contract/internal/service/ContractServiceImpl.java
+13
-8
ContractPerformWarningProcessor.java
...ract/query/processor/ContractPerformWarningProcessor.java
+2
-1
ContractWarnSettingProcessor.java
...ontract/query/processor/ContractWarnSettingProcessor.java
+2
-1
ContractBill$sequence.jmx
...es/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
+1
-1
ContractBill$serial.jmx
...rces/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
+1
-1
ContractBill.jmx
...n/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
+1
-1
ContractWarningExe.jmx
...rces/com/xyst/dinas/contract/query/ContractWarningExe.jmx
+4
-4
BusinessTripApply$sequence.jmx
...ces/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
+1
-1
BusinessTripApply$serial.jmx
...urces/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
+1
-1
BusinessTripApply.jmx
...in/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
+1
-1
ProtocolDocument$sequence.jmx
...rces/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
+1
-1
ProtocolDocument$serial.jmx
...ources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
+1
-1
ProtocolDocument.jmx
...ain/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
+1
-1
SealBorrow$sequence.jmx
.../resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
+1
-1
SealBorrow$serial.jmx
...in/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
+1
-1
SealBorrow.jmx
.../src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
+1
-1
UseCarApply$sequence.jmx
...resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
+1
-1
UseCarApply$serial.jmx
...n/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
+1
-1
UseCarApply.jmx
...src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
+1
-1
ProjectFiled$sequence.jmx
...ces/com/xyst/dinas/project/bill/ProjectFiled$sequence.jmx
+1
-1
ProjectFiled$serial.jmx
...urces/com/xyst/dinas/project/bill/ProjectFiled$serial.jmx
+1
-1
ProjectFiled.jmx
...in/resources/com/xyst/dinas/project/bill/ProjectFiled.jmx
+1
-1
PurchaseSandCompany$sequence.jmx
.../xyst/dinas/project/bill/PurchaseSandCompany$sequence.jmx
+1
-1
PurchaseSandCompany$serial.jmx
...om/xyst/dinas/project/bill/PurchaseSandCompany$serial.jmx
+1
-1
PurchaseSandCompany.jmx
...urces/com/xyst/dinas/project/bill/PurchaseSandCompany.jmx
+1
-1
No files found.
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarnSetting.java
View file @
308cf05f
...
...
@@ -31,6 +31,8 @@ public interface WarnSetting {
/** 指标名称*/
String
getTarget
();
String
getTargetType
();
/** 阀值上限*/
String
getMax
();
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarnSettingEntity.java
View file @
308cf05f
...
...
@@ -8,6 +8,7 @@ public class WarnSettingEntity implements WarnSetting{
private
String
billType
;
private
UUID
billId
;
private
String
target
;
private
String
targetType
;
private
String
max
;
private
String
min
;
...
...
@@ -18,6 +19,14 @@ public class WarnSettingEntity implements WarnSetting{
public
String
getTargetType
()
{
return
targetType
;
}
public
void
setTargetType
(
String
targetType
)
{
this
.
targetType
=
targetType
;
}
public
String
getMemo
()
{
return
memo
;
}
...
...
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarnTargetTypeEnum.java
0 → 100644
View file @
308cf05f
package
com
.
xyst
.
dinas
.
biz
.
warn
;
/**
* 预警指标类型枚举
*
* @author Jackpot
* @date 2021年4月9日
*/
public
enum
WarnTargetTypeEnum
{
/**
* 整数
*/
INT_TYPE
(
"INT_TYPE"
,
"整数"
),
/**
* 小数
*/
NUMBER_TYPE
(
"NUMBER_TYPE"
,
"小数"
),
/**
* 日期
*/
DATE_TYPE
(
"DATE_TYPE"
,
"日期"
),
/**
* 时间
*/
TIME_TYPE
(
"TIME_TYPE"
,
"时间"
),
/**
* 日期时间
*/
DATE_TIME_TYPE
(
"DATE_TIME_TYPE"
,
"日期时间"
),
/**
* 布尔
*/
BOOL_TYPE
(
"BOOL_TYPE"
,
"布尔"
),
;
String
code
;
String
name
;
WarnTargetTypeEnum
(
String
code
,
String
name
)
{
this
.
code
=
code
;
this
.
name
=
name
;
}
public
String
getCode
()
{
return
code
;
}
public
String
getName
()
{
return
name
;
}
}
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/datamodel/WarnSetting.mk
View file @
308cf05f
...
...
@@ -23,6 +23,9 @@
<attribute id='cbb5b983-299b-4259-97d9-6470651bb18b' name='target' columnName='target' title='指标' type='string' default='' precision='' isArray='false'>
<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='100'></annotation>
</attribute>
<attribute id='cbb5b983-299b-4259-97d9-6470651bb18b' name='targetType' columnName='target_type' title='指标类型' type='string' default='' precision='' isArray='false'>
<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='100'></annotation>
</attribute>
<attribute id='cbb5b983-299b-4259-97d9-6470651bb18b' name='max' columnName='max' title='指标上限' type='string' default='' precision='' isArray='false'>
<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='100'></annotation>
</attribute>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$sequence.jmx
View file @
308cf05f
<?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>
e6d7d0ff-fe61-46ad-8b78-0131a00c7562
</id>
<id>
8e2eac78-deff-409f-9a6b-2b304aef674c
</id>
<name>
com.xyst.dinas.biz.bill.Organization$sequence
</name>
<title>
组织机构$sequence
</title>
<description>
组织机构
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$serial.jmx
View file @
308cf05f
<?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>
224131f8-a0e6-4936-8ad1-b70bff26d660
</id>
<id>
343b7215-7448-43ee-957c-a4cac6afc19d
</id>
<name>
com.xyst.dinas.biz.bill.Organization$serial
</name>
<title>
组织机构$serial
</title>
<description>
组织机构
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.jmx
View file @
308cf05f
<?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>
6c221479-4e8e-4a82-87f2-537d1c2d0496
</id>
<id>
d45f4b7e-175d-4b1c-b2ac-c70549b8ee3f
</id>
<name>
com.xyst.dinas.biz.bill.Organization
</name>
<title>
组织机构
</title>
<description>
组织机构
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$sequence.jmx
View file @
308cf05f
<?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>
f918d96c-7a93-41db-8811-519fb7b3b8c
3
</id>
<id>
ce1c547d-de46-47c7-8589-daf95bcdf47
3
</id>
<name>
com.xyst.dinas.biz.bill.Position$sequence
</name>
<title>
岗位$sequence
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position$serial.jmx
View file @
308cf05f
<?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>
af81f3c9-26df-4694-9291-aacbae5286b2
</id>
<id>
53c135ae-9552-4f7b-a936-b2f5159257dc
</id>
<name>
com.xyst.dinas.biz.bill.Position$serial
</name>
<title>
岗位$serial
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Position.jmx
View file @
308cf05f
<?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>
976cc9e6-3a6b-4d42-b438-f2310c043fb1
</id>
<id>
fbd721cf-b881-43e2-8e80-0ea9021a42bc
</id>
<name>
com.xyst.dinas.biz.bill.Position
</name>
<title>
岗位
</title>
<description>
岗位
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx
View file @
308cf05f
<?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>
64bf3633-d1cc-4ccd-b802-cdd2eb43a062
</id>
<id>
85877add-ba19-4d84-94da-7cab867409ed
</id>
<name>
com.xyst.dinas.biz.bill.ShipInfo$sequence
</name>
<title>
船舶备案$sequence
</title>
<description>
船舶备案
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx
View file @
308cf05f
<?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>
fa4c2c0c-a227-4b3d-83a1-a1caae81300
0
</id>
<id>
926f7e98-471c-4132-ab16-615097f16b5
0
</id>
<name>
com.xyst.dinas.biz.bill.ShipInfo$serial
</name>
<title>
船舶备案$serial
</title>
<description>
船舶备案
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx
View file @
308cf05f
<?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>
6dc4d21f-8994-42dd-819e-01bec7efc102
</id>
<id>
7ce23f64-d1c9-42db-8c79-535a51a7615e
</id>
<name>
com.xyst.dinas.biz.bill.ShipInfo
</name>
<title>
船舶备案
</title>
<description>
船舶备案
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$sequence.jmx
View file @
308cf05f
<?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>
a983d109-2118-4404-a632-18820e6c4449
</id>
<id>
25e93d6c-71cb-4316-9f50-c6e1e9939d50
</id>
<name>
com.xyst.dinas.biz.bill.Station$sequence
</name>
<title>
场站$sequence
</title>
<description>
场站
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station$serial.jmx
View file @
308cf05f
<?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>
f
a742cd1-574a-46bd-8598-c1bca547ac37
</id>
<id>
f
921027e-04c7-4f47-b283-33745cb3bf49
</id>
<name>
com.xyst.dinas.biz.bill.Station$serial
</name>
<title>
场站$serial
</title>
<description>
场站
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Station.jmx
View file @
308cf05f
<?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>
bd76396a-737d-4596-9592-d254678bcf2e
</id>
<id>
e4d74f3a-1cb9-4f9d-aec5-be3f302718c7
</id>
<name>
com.xyst.dinas.biz.bill.Station
</name>
<title>
场站
</title>
<description>
场站
</description>
...
...
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/WarnSetting.jmx
View file @
308cf05f
...
...
@@ -61,6 +61,20 @@
</m:annotation>
</m:annotations>
<m:id>
cbb5b983-299b-4259-97d9-6470651bb18b
</m:id>
<m:name>
targetType
</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.StringLength
</m:type>
<m:value>
100
</m:value>
</m:annotation>
</m:annotations>
<m:id>
cbb5b983-299b-4259-97d9-6470651bb18b
</m:id>
<m:name>
max
</m:name>
<m:title>
指标上限
</m:title>
<m:type>
string
</m:type>
...
...
backend/xyst.dinas.biz/src/main/resources/config/WarnSetting.hbm.xml
View file @
308cf05f
...
...
@@ -52,6 +52,9 @@
<property
name=
"target"
type=
"nstring"
not-null=
"false"
>
<column
name=
"target"
length=
"100"
></column>
</property>
<property
name=
"targetType"
type=
"nstring"
not-null=
"false"
>
<column
name=
"target_type"
length=
"100"
></column>
</property>
<property
name=
"max"
type=
"nstring"
not-null=
"false"
>
<column
name=
"max"
length=
"100"
></column>
</property>
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java
View file @
308cf05f
...
...
@@ -21,6 +21,7 @@ import com.beecode.inz.common.BaseConstants;
import
com.beecode.inz.workflow.service.InzWorkflowService
;
import
com.xyst.dinas.biz.dao.DinasOrganizationDao
;
import
com.xyst.dinas.biz.warn.WarnSettingEntity
;
import
com.xyst.dinas.biz.warn.WarnTargetTypeEnum
;
import
com.xyst.dinas.biz.warn.dao.WarnSettingDao
;
import
com.xyst.dinas.biz.warn.service.IWarningSettingService
;
import
com.xyst.dinas.contract.constant.ContractConstant
;
...
...
@@ -200,6 +201,7 @@ public class ContractServiceImpl implements ContractService {
warnSetting
.
setBillType
(
billType
);
warnSetting
.
setBillId
(
contractId
);
warnSetting
.
setTarget
(
dinasTypeName
);
warnSetting
.
setTargetType
(
WarnTargetTypeEnum
.
NUMBER_TYPE
.
getCode
());
warnSetting
.
setOpen
(
true
);
warnSetting
.
setMemo
(
contractBaseInfo
);
warningSettingService
.
insertWarnSetting
(
warnSetting
);
...
...
@@ -210,6 +212,7 @@ public class ContractServiceImpl implements ContractService {
expireWarnSetting
.
setBillType
(
billType
);
expireWarnSetting
.
setBillId
(
contractId
);
expireWarnSetting
.
setTarget
(
target2
);
expireWarnSetting
.
setTargetType
(
WarnTargetTypeEnum
.
INT_TYPE
.
getCode
());
expireWarnSetting
.
setOpen
(
true
);
expireWarnSetting
.
setMemo
(
contractBaseInfo
);
warningSettingService
.
insertWarnSetting
(
expireWarnSetting
);
...
...
@@ -219,6 +222,7 @@ public class ContractServiceImpl implements ContractService {
paymentWarnSetting
.
setBillType
(
billType
);
paymentWarnSetting
.
setBillId
(
contractId
);
paymentWarnSetting
.
setTarget
(
target3
);
paymentWarnSetting
.
setTargetType
(
WarnTargetTypeEnum
.
NUMBER_TYPE
.
getCode
());
paymentWarnSetting
.
setOpen
(
true
);
paymentWarnSetting
.
setMemo
(
contractBaseInfo
);
warningSettingService
.
insertWarnSetting
(
paymentWarnSetting
);
...
...
@@ -278,19 +282,20 @@ public class ContractServiceImpl implements ContractService {
@Override
public
Object
queryWarnSettingById
(
UUID
id
)
{
KObject
KObj
=
warnSettingDao
.
queryWarnSettingById
(
id
);
String
billId
=
KObj
.
getString
(
"billId"
);
KObject
warnSetting
=
warnSettingDao
.
queryWarnSettingById
(
id
);
String
billId
=
warnSetting
.
getString
(
"billId"
);
KObject
contract
=
contractDao
.
load
(
UUID
.
fromString
(
billId
));
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"contractName"
,
contract
.
getString
(
"contractName"
));
map
.
put
(
"purchaseSandUnitName"
,
contract
.
getString
(
"purchaseSandUnitName"
));
map
.
put
(
"project"
,
contract
.
isNull
(
"project"
)
?
""
:
contract
.
get
(
"project"
).
getString
(
"projectName"
));
map
.
put
(
"personnel"
,
KObj
.
getString
(
"personnel"
));
map
.
put
(
"max"
,
KObj
.
getString
(
"max"
));
map
.
put
(
"min"
,
KObj
.
getString
(
"min"
));
map
.
put
(
"target"
,
KObj
.
getString
(
"target"
));
map
.
put
(
"id"
,
KObj
.
getUuid
(
"id"
));
map
.
put
(
"billId"
,
KObj
.
getString
(
"billId"
));
map
.
put
(
"personnel"
,
warnSetting
.
getString
(
"personnel"
));
map
.
put
(
"max"
,
warnSetting
.
getString
(
"max"
));
map
.
put
(
"min"
,
warnSetting
.
getString
(
"min"
));
map
.
put
(
"target"
,
warnSetting
.
getString
(
"target"
));
map
.
put
(
"targetType"
,
warnSetting
.
getString
(
"targetType"
));
map
.
put
(
"id"
,
warnSetting
.
getUuid
(
"id"
));
map
.
put
(
"billId"
,
warnSetting
.
getString
(
"billId"
));
return
map
;
}
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractPerformWarningProcessor.java
View file @
308cf05f
...
...
@@ -25,7 +25,8 @@ public class ContractPerformWarningProcessor implements DataProcessor {
KObject
contract
=
contractService
.
queryContract
(
contractId
);
row
.
put
(
"projectName"
,
contract
.
isNull
(
"project"
)
?
""
:
contract
.
get
(
"project"
).
getString
(
"projectName"
));
row
.
put
(
"contractName"
,
contract
.
getString
(
"contractName"
));
row
.
put
(
"purchaseSandUnitName"
,
contract
.
getString
(
"purchaseSandUnitName"
));
String
purchaseSandUnitName
=
contract
.
get
(
"purchaseSandUnit"
).
getString
(
"name"
);
row
.
put
(
"purchaseSandUnitName"
,
purchaseSandUnitName
);
//contract.getString("purchaseSandUnitName")
//KObject warnSetting = row.get("warnSetting");
row
.
put
(
"regionCompanyName"
,
contract
.
getString
(
"regionCompanyName"
));
row
.
put
(
"stationName"
,
contract
.
isNull
(
"station"
)
?
""
:
contract
.
get
(
"station"
).
getString
(
"stationName"
));
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractWarnSettingProcessor.java
View file @
308cf05f
...
...
@@ -39,7 +39,8 @@ public class ContractWarnSettingProcessor implements DataProcessor {
Assert
.
notNull
(
contract
,
"找不到对应的合同!"
);
row
.
put
(
"projectName"
,
contract
.
isNull
(
"project"
)
?
""
:
contract
.
get
(
"project"
).
getString
(
"projectName"
));
row
.
put
(
"contractName"
,
contract
.
getString
(
"contractName"
));
row
.
put
(
"purchaseSandUnitName"
,
contract
.
getString
(
"purchaseSandUnitName"
));
String
purchaseSandUnitName
=
contract
.
get
(
"purchaseSandUnit"
).
getString
(
"name"
);
row
.
put
(
"purchaseSandUnitName"
,
purchaseSandUnitName
);
//contract.getString("purchaseSandUnitName")
String
personnel
=
row
.
get
(
"personnel"
)
!=
null
?
row
.
get
(
"personnel"
).
toString
()
:
""
;
String
personnelName
=
""
;
if
(
StringUtils
.
isNotEmpty
(
personnel
))
{
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$sequence.jmx
View file @
308cf05f
<?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>
c461433a-b709-47f6-bba5-3b83e6e2c10b
</id>
<id>
be2073e4-b525-415b-a48c-ed4c74724264
</id>
<name>
com.xyst.dinas.contract.bill.ContractBill$sequence
</name>
<title>
合同单据$sequence
</title>
<description>
合同单据
</description>
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill$serial.jmx
View file @
308cf05f
<?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>
e638bfe9-57b0-4f00-a84a-bfa6dd7c0848
</id>
<id>
7365fee0-a73b-4033-9eb0-2ee3f6f335f3
</id>
<name>
com.xyst.dinas.contract.bill.ContractBill$serial
</name>
<title>
合同单据$serial
</title>
<description>
合同单据
</description>
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/bill/ContractBill.jmx
View file @
308cf05f
<?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>
eba2d45a-7579-497e-b3c9-28dcdbac1ae5
</id>
<id>
8a20831a-75f0-4ff7-a268-b6a2ff25200e
</id>
<name>
com.xyst.dinas.contract.bill.ContractBill
</name>
<title>
合同单据
</title>
<description>
合同单据
</description>
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractWarningExe.jmx
View file @
308cf05f
...
...
@@ -70,8 +70,8 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
memo
</m:name>
<m:title>
备注
</m:title>
<m:name>
target
</m:name>
<m:title>
预警指标
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
...
...
@@ -80,8 +80,8 @@
<m:desc></m:desc>
</m:field>
<m:field>
<m:name>
target
</m:name>
<m:title>
预警指标
</m:title>
<m:name>
memo
</m:name>
<m:title>
备注
</m:title>
<m:type>
string
</m:type>
<m:ref>
<m:name></m:name>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$sequence.jmx
View file @
308cf05f
<?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>
f86667d0-d39a-4f1b-90b9-362b5fdfcf42
</id>
<id>
9f41deb0-3e62-49c2-911b-af7f683a604d
</id>
<name>
com.xyst.dinas.oa.bill.BusinessTripApply$sequence
</name>
<title>
出差申请$sequence
</title>
<description>
出差申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply$serial.jmx
View file @
308cf05f
<?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>
c6ed834d-1e0d-410d-97ea-9f4683df880c
</id>
<id>
b40c3fed-0843-4bbe-a266-ba353ae9db67
</id>
<name>
com.xyst.dinas.oa.bill.BusinessTripApply$serial
</name>
<title>
出差申请$serial
</title>
<description>
出差申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/BusinessTripApply.jmx
View file @
308cf05f
<?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>
b861545f-04fe-4953-9965-b9497db7b525
</id>
<id>
7d11ce7d-a750-48e3-a25f-a213acfd2112
</id>
<name>
com.xyst.dinas.oa.bill.BusinessTripApply
</name>
<title>
出差申请
</title>
<description>
出差申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$sequence.jmx
View file @
308cf05f
<?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>
c7bd4ccf-685a-487f-9513-6bffc23c73b9
</id>
<id>
b3d61538-c3b7-4c48-80d5-eb02411aa6a0
</id>
<name>
com.xyst.dinas.oa.bill.ProtocolDocument$sequence
</name>
<title>
拟文$sequence
</title>
<description>
拟文
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument$serial.jmx
View file @
308cf05f
<?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>
9a872f35-642c-4f5f-be74-498c206a5c11
</id>
<id>
db3ea02d-05ac-40f0-9ef6-74f7b256ff4a
</id>
<name>
com.xyst.dinas.oa.bill.ProtocolDocument$serial
</name>
<title>
拟文$serial
</title>
<description>
拟文
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/ProtocolDocument.jmx
View file @
308cf05f
<?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>
871b3727-5d23-49d8-838b-5e99a436d18d
</id>
<id>
f3710f50-3948-4bee-bd5a-0f5d145f5642
</id>
<name>
com.xyst.dinas.oa.bill.ProtocolDocument
</name>
<title>
拟文
</title>
<description>
拟文
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$sequence.jmx
View file @
308cf05f
<?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>
7ade5590-f158-4718-8c41-d5f929880483
</id>
<id>
c0749fe9-b210-44d9-93f3-83f69bbbc717
</id>
<name>
com.xyst.dinas.oa.bill.SealBorrow$sequence
</name>
<title>
证章借出$sequence
</title>
<description>
证章借出
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow$serial.jmx
View file @
308cf05f
<?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>
f18b572e-3157-4dae-9de5-e0b1923afbac
</id>
<id>
9adcc301-b4b5-4246-a836-7e24e8995938
</id>
<name>
com.xyst.dinas.oa.bill.SealBorrow$serial
</name>
<title>
证章借出$serial
</title>
<description>
证章借出
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/SealBorrow.jmx
View file @
308cf05f
<?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>
0847d9d5-d5a9-402d-890c-1cec204389a9
</id>
<id>
1764ee3f-2f8d-4526-b52a-80122dda48ab
</id>
<name>
com.xyst.dinas.oa.bill.SealBorrow
</name>
<title>
证章借出
</title>
<description>
证章借出
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$sequence.jmx
View file @
308cf05f
<?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>
3ade448e-5240-4715-b70d-2cdcabf0cc4d
</id>
<id>
e0742302-5764-4d51-be81-26c76be9ff40
</id>
<name>
com.xyst.dinas.oa.bill.UseCarApply$sequence
</name>
<title>
用车申请$sequence
</title>
<description>
用车申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply$serial.jmx
View file @
308cf05f
<?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>
d37f2da3-f7ae-40d6-9383-9ea736fc8fca
</id>
<id>
881c40d2-8e89-4953-9b5f-dfeb40dd2b6c
</id>
<name>
com.xyst.dinas.oa.bill.UseCarApply$serial
</name>
<title>
用车申请$serial
</title>
<description>
用车申请
</description>
...
...
backend/xyst.dinas.oa/src/main/resources/com/xyst/dinas/oa/bill/UseCarApply.jmx
View file @
308cf05f
<?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>
f152e8e9-cb3a-4328-a1ea-eaea48aefe65
</id>
<id>
4fae895e-a493-4a23-a3a2-e1fada670732
</id>
<name>
com.xyst.dinas.oa.bill.UseCarApply
</name>
<title>
用车申请
</title>
<description>
用车申请
</description>
...
...
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$sequence.jmx
View file @
308cf05f
<?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>
02009963-d259-4d65-a69d-f249073dc64d
</id>
<id>
db17ac74-6b6e-4883-aaa8-f6cf787b2469
</id>
<name>
com.xyst.dinas.project.bill.ProjectFiled$sequence
</name>
<title>
项目备案$sequence
</title>
<description>
项目备案
</description>
...
...
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled$serial.jmx
View file @
308cf05f
<?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>
c1a3a514-64e1-454e-bd12-3ce2c9b2085
1
</id>
<id>
dc38ebff-031a-4f5d-8926-0cb90da8f17
1
</id>
<name>
com.xyst.dinas.project.bill.ProjectFiled$serial
</name>
<title>
项目备案$serial
</title>
<description>
项目备案
</description>
...
...
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/ProjectFiled.jmx
View file @
308cf05f
<?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>
25266adc-b926-4c38-ac2e-9ca418de5844
</id>
<id>
08cd94ff-c41d-4a9a-aeb9-fd3346206ee5
</id>
<name>
com.xyst.dinas.project.bill.ProjectFiled
</name>
<title>
项目备案
</title>
<description>
项目备案
</description>
...
...
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$sequence.jmx
View file @
308cf05f
<?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>
200194e5-237d-4489-961e-1301d8465517
</id>
<id>
ff9d3097-7d9b-4b57-82bb-a4dcd1e439e6
</id>
<name>
com.xyst.dinas.project.bill.PurchaseSandCompany$sequence
</name>
<title>
购砂单位$sequence
</title>
<description>
购砂单位
</description>
...
...
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany$serial.jmx
View file @
308cf05f
<?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>
995a8bd7-7589-414a-bfb6-8b56560611aa
</id>
<id>
7f604fe1-f98b-45a2-9ab1-a96d3df28e14
</id>
<name>
com.xyst.dinas.project.bill.PurchaseSandCompany$serial
</name>
<title>
购砂单位$serial
</title>
<description>
购砂单位
</description>
...
...
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/bill/PurchaseSandCompany.jmx
View file @
308cf05f
<?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>
8d2ab6d0-f139-47de-8251-4efd9de7f0a6
</id>
<id>
6e4ea80c-aabc-4e73-8aab-a1b3f732886e
</id>
<name>
com.xyst.dinas.project.bill.PurchaseSandCompany
</name>
<title>
购砂单位
</title>
<description>
购砂单位
</description>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment