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
35c3b684
Commit
35c3b684
authored
Jun 11, 2021
by
焦凯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同的合同状态和审批状态改到后端处理
parent
e41da6c4
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
182 additions
and
3 deletions
+182
-3
ContractConfiguration.java
...com/xyst/dinas/contract/config/ContractConfiguration.java
+12
-0
ApproveStateEnum.java
...com/xyst/dinas/contract/enumeration/ApproveStateEnum.java
+65
-0
ContractStateEnum.java
...om/xyst/dinas/contract/enumeration/ContractStateEnum.java
+31
-0
ContractDetailProcessor.java
...nas/contract/query/processor/ContractDetailProcessor.java
+33
-0
ContractInfoProcessor.java
...dinas/contract/query/processor/ContractInfoProcessor.java
+35
-0
Contract.mk
.../src/main/model/com/xyst/dinas/contract/query/Contract.mk
+1
-0
ContractDetail.mk
...ain/model/com/xyst/dinas/contract/query/ContractDetail.mk
+1
-0
ContractNoAuthFilterScene.mk
...om/xyst/dinas/contract/query/ContractNoAuthFilterScene.mk
+1
-0
Contract.jmx
...main/resources/com/xyst/dinas/contract/query/Contract.jmx
+1
-1
ContractDetail.jmx
...esources/com/xyst/dinas/contract/query/ContractDetail.jmx
+1
-1
ContractNoAuthFilterScene.jmx
...m/xyst/dinas/contract/query/ContractNoAuthFilterScene.jmx
+1
-1
No files found.
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java
View file @
35c3b684
...
@@ -18,6 +18,8 @@ import com.xyst.dinas.contract.internal.service.ContractServiceImpl;
...
@@ -18,6 +18,8 @@ import com.xyst.dinas.contract.internal.service.ContractServiceImpl;
import
com.xyst.dinas.contract.internal.service.ContractWarnServiceImpl
;
import
com.xyst.dinas.contract.internal.service.ContractWarnServiceImpl
;
import
com.xyst.dinas.contract.listener.ContractProcessEventListener
;
import
com.xyst.dinas.contract.listener.ContractProcessEventListener
;
import
com.xyst.dinas.contract.listener.ContractUpdateProcessListener
;
import
com.xyst.dinas.contract.listener.ContractUpdateProcessListener
;
import
com.xyst.dinas.contract.query.processor.ContractDetailProcessor
;
import
com.xyst.dinas.contract.query.processor.ContractInfoProcessor
;
import
com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor
;
import
com.xyst.dinas.contract.query.processor.ContractPerformWarningProcessor
;
import
com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor
;
import
com.xyst.dinas.contract.query.processor.ContractWarnSettingProcessor
;
import
com.xyst.dinas.contract.service.ContractService
;
import
com.xyst.dinas.contract.service.ContractService
;
...
@@ -99,6 +101,16 @@ public class ContractConfiguration {
...
@@ -99,6 +101,16 @@ public class ContractConfiguration {
return
new
ContractListDefaultScene
();
return
new
ContractListDefaultScene
();
}
}
@Bean
(
"com.xyst.dinas.contract.query.processor.ContractInfoProcessor"
)
public
ContractInfoProcessor
contractInfoProcessor
()
{
return
new
ContractInfoProcessor
();
}
@Bean
(
"com.xyst.dinas.contract.query.processor.ContractDetailProcessor"
)
public
ContractDetailProcessor
contractDetailProcessor
()
{
return
new
ContractDetailProcessor
();
}
//合同变更审批工作流
//合同变更审批工作流
@Bean
@Bean
public
BizTypeWorkflowConfiguration
contractUpdateWorkflowConfig
()
{
public
BizTypeWorkflowConfiguration
contractUpdateWorkflowConfig
()
{
...
...
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/enumeration/ApproveStateEnum.java
0 → 100644
View file @
35c3b684
package
com
.
xyst
.
dinas
.
contract
.
enumeration
;
/**
*
* @author Joker
*
*/
public
enum
ApproveStateEnum
{
/**
* 未提交
*/
ONSUBMIT
(
0
,
"未提交"
)
{
},
/**
* 审批中
*/
APPROVING
(
1
,
"正在审批中"
),
/**
* 审批通过
*/
APPROVED
(
2
,
"审批通过"
),
/**
* 审批未通过
*/
REJECT
(
3
,
"驳回"
)
{
};
private
int
key
;
private
String
title
;
private
ApproveStateEnum
(
int
key
,
String
title
)
{
this
.
key
=
key
;
this
.
title
=
title
;
}
public
int
getKey
()
{
return
this
.
key
;
}
public
String
getTitle
()
{
return
this
.
title
;
}
public
static
ApproveStateEnum
getApproveStateEnumByKey
(
int
key
)
{
switch
(
key
)
{
case
0
:
return
ApproveStateEnum
.
ONSUBMIT
;
case
1
:
return
ApproveStateEnum
.
APPROVING
;
case
2
:
return
ApproveStateEnum
.
APPROVED
;
case
3
:
return
ApproveStateEnum
.
REJECT
;
default
:
return
null
;
}
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/enumeration/ContractStateEnum.java
View file @
35c3b684
...
@@ -45,5 +45,36 @@ public enum ContractStateEnum {
...
@@ -45,5 +45,36 @@ public enum ContractStateEnum {
return
name
;
return
name
;
}
}
/**
* 格式化状态名称
* param:
* (String)name 标识状态的英文代码 例如:EXECUTING
* return:
* (String)title
*/
public
static
String
formatName
(
String
name
)
{
for
(
ContractStateEnum
c
:
ContractStateEnum
.
values
())
{
if
(
c
.
code
.
equals
(
name
))
{
return
c
.
name
;
}
}
return
null
;
}
/**
* 格式化状态标题
* param:
* (String)title 标识状态
* return:
* (String)name
*/
public
static
String
formatTitle
(
String
title
)
{
for
(
ContractStateEnum
c
:
ContractStateEnum
.
values
())
{
if
(
c
.
name
.
equals
(
title
))
{
return
c
.
code
;
}
}
return
null
;
}
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractDetailProcessor.java
0 → 100644
View file @
35c3b684
package
com
.
xyst
.
dinas
.
contract
.
query
.
processor
;
import
java.util.List
;
import
com.beecode.inz.query.entity.RowData
;
import
com.beecode.inz.query.processor.DataProcessor
;
import
com.beecode.inz.query.processor.DataProcessorContext
;
import
com.xyst.dinas.contract.enumeration.ApproveStateEnum
;
import
com.xyst.dinas.contract.enumeration.ContractStateEnum
;
/**
* 合同
*
* @author Joker
* @date 2021年6月11日
*/
public
class
ContractDetailProcessor
implements
DataProcessor
{
@Override
public
void
process
(
DataProcessorContext
context
)
{
List
<
RowData
>
rowDatas
=
context
.
getRowDatas
();
for
(
RowData
row
:
rowDatas
)
{
if
(
row
.
get
(
"master.contractState"
)
!=
null
)
{
row
.
put
(
"master.contractState"
,
ContractStateEnum
.
formatName
(
row
.
get
(
"master.contractState"
).
toString
()));
}
if
(
row
.
get
(
"master.approveState"
)
!=
null
)
{
row
.
put
(
"master.approveState"
,
ApproveStateEnum
.
getApproveStateEnumByKey
((
int
)
row
.
get
(
"master.approveState"
)).
getTitle
());
}
}
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/query/processor/ContractInfoProcessor.java
0 → 100644
View file @
35c3b684
package
com
.
xyst
.
dinas
.
contract
.
query
.
processor
;
import
java.util.List
;
import
com.beecode.inz.query.entity.RowData
;
import
com.beecode.inz.query.processor.DataProcessor
;
import
com.beecode.inz.query.processor.DataProcessorContext
;
import
com.xyst.dinas.contract.constant.ContractConstant
;
import
com.xyst.dinas.contract.enumeration.ApproveStateEnum
;
import
com.xyst.dinas.contract.enumeration.ContractStateEnum
;
/**
* 合同
*
* @author Joker
* @date 2021年6月11日
*/
public
class
ContractInfoProcessor
implements
DataProcessor
{
@Override
public
void
process
(
DataProcessorContext
context
)
{
List
<
RowData
>
rowDatas
=
context
.
getRowDatas
();
for
(
RowData
row
:
rowDatas
)
{
if
(
row
.
get
(
ContractConstant
.
CONTRACT_STATE
)
!=
null
)
{
row
.
put
(
ContractConstant
.
CONTRACT_STATE
,
ContractStateEnum
.
formatName
(
row
.
get
(
ContractConstant
.
CONTRACT_STATE
).
toString
()));
}
if
(
row
.
get
(
"approveState"
)
!=
null
)
{
row
.
put
(
"approveState"
,
ApproveStateEnum
.
getApproveStateEnumByKey
((
int
)
row
.
get
(
"approveState"
)).
getTitle
());
}
}
}
}
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/Contract.mk
View file @
35c3b684
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<content>
<content>
<customQuery id='e9932470-2599-4a92-a1e2-1d5d418a96a0'>
<customQuery id='e9932470-2599-4a92-a1e2-1d5d418a96a0'>
<kclass>com.xyst.dinas.contract.datamodel.Contract</kclass>
<kclass>com.xyst.dinas.contract.datamodel.Contract</kclass>
<dataProcessor>com.xyst.dinas.contract.query.processor.ContractInfoProcessor</dataProcessor>
<innerScene title='全部'>
<innerScene title='全部'>
<id>c1f90ec7-d48d-440f-9e04-aef646caa107</id>
<id>c1f90ec7-d48d-440f-9e04-aef646caa107</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
...
...
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/ContractDetail.mk
View file @
35c3b684
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<content>
<content>
<customQuery id='58b626c6-c457-4bb3-81e4-d09f11ecd553'>
<customQuery id='58b626c6-c457-4bb3-81e4-d09f11ecd553'>
<kclass>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</kclass>
<kclass>com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail</kclass>
<dataProcessor>com.xyst.dinas.contract.query.processor.ContractDetailProcessor</dataProcessor>
<innerScene title='全部'>
<innerScene title='全部'>
<id>cfd478b1-7e2e-41c5-bb5e-f6500c101341</id>
<id>cfd478b1-7e2e-41c5-bb5e-f6500c101341</id>
<javaImplement>com.beecode.inz.common.scene.CommonSubAllScene</javaImplement>
<javaImplement>com.beecode.inz.common.scene.CommonSubAllScene</javaImplement>
...
...
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/ContractNoAuthFilterScene.mk
View file @
35c3b684
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
<content>
<content>
<customQuery id='42be82aa-a819-40dc-8c54-0bcee2862c3f'>
<customQuery id='42be82aa-a819-40dc-8c54-0bcee2862c3f'>
<kclass>com.xyst.dinas.contract.datamodel.Contract</kclass>
<kclass>com.xyst.dinas.contract.datamodel.Contract</kclass>
<dataProcessor>com.xyst.dinas.contract.query.processor.ContractInfoProcessor</dataProcessor>
<innerScene title='全部'>
<innerScene title='全部'>
<id>16a0d14f-f8bd-4446-b55a-a99db05bced6</id>
<id>16a0d14f-f8bd-4446-b55a-a99db05bced6</id>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
<javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/Contract.jmx
View file @
35c3b684
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<content>
<content>
<m:query>
<m:query>
<m:type>
com.xyst.dinas.contract.datamodel.Contract
</m:type>
<m:type>
com.xyst.dinas.contract.datamodel.Contract
</m:type>
<m:dataProcessor></m:dataProcessor>
<m:dataProcessor>
com.xyst.dinas.contract.query.processor.ContractInfoProcessor
</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScenes>
<m:innerScene>
<m:innerScene>
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractDetail.jmx
View file @
35c3b684
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<content>
<content>
<m:query>
<m:query>
<m:type>
com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail
</m:type>
<m:type>
com.xyst.dinas.contract.datamodel.ContractAssociatedcontractDetail
</m:type>
<m:dataProcessor></m:dataProcessor>
<m:dataProcessor>
com.xyst.dinas.contract.query.processor.ContractDetailProcessor
</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScenes>
<m:innerScene>
<m:innerScene>
...
...
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/ContractNoAuthFilterScene.jmx
View file @
35c3b684
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<content>
<content>
<m:query>
<m:query>
<m:type>
com.xyst.dinas.contract.datamodel.Contract
</m:type>
<m:type>
com.xyst.dinas.contract.datamodel.Contract
</m:type>
<m:dataProcessor></m:dataProcessor>
<m:dataProcessor>
com.xyst.dinas.contract.query.processor.ContractInfoProcessor
</m:dataProcessor>
<m:authorityItem></m:authorityItem>
<m:authorityItem></m:authorityItem>
<m:innerScenes>
<m:innerScenes>
<m:innerScene>
<m:innerScene>
...
...
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