Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sample-form-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
sample-form-platform
Commits
2d3bed33
Commit
2d3bed33
authored
Nov 16, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加公共庫
parent
1df7c5c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
14 deletions
+23
-14
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
...hx/module/matter/service/impl/MatterDatumServiceImpl.java
+10
-6
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
...als/xhx/module/matter/service/impl/MatterServiceImpl.java
+13
-8
No files found.
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @
2d3bed33
...
@@ -167,14 +167,19 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
...
@@ -167,14 +167,19 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
int
success
=
0
;
int
success
=
0
;
int
fail
=
0
;
int
fail
=
0
;
List
<
PubdatumEntity
>
pubdatumEntityList
=
pubdatumService
.
get
(
pubIds
,
context
);
List
<
PubdatumEntity
>
pubdatumEntityList
=
pubdatumService
.
get
(
pubIds
,
context
);
List
<
MatterDatumEntity
>
matterDatumEntities
=
new
ArrayList
<>();
for
(
PubdatumEntity
pubdatumEntity
:
pubdatumEntityList
)
{
for
(
PubdatumEntity
pubdatumEntity
:
pubdatumEntityList
)
{
Boolean
bool
=
updateOrSave
(
pubdatumEntity
,
matterId
,
siteId
,
context
);
MatterDatumEntity
matterDatumEntity
=
updateOrSave
(
pubdatumEntity
,
matterId
,
siteId
,
context
);
if
(
bool
)
{
if
(!
ObjectUtils
.
isEmpty
(
matterDatumEntity
))
{
matterDatumEntities
.
add
(
matterDatumEntity
);
success
++;
success
++;
}
else
{
}
else
{
fail
++;
fail
++;
}
}
}
}
if
(!
ObjectUtils
.
isEmpty
(
matterDatumEntities
)){
this
.
save
(
matterDatumEntities
,
context
);
}
String
msg
=
"当前加入材料已存在!"
;
String
msg
=
"当前加入材料已存在!"
;
if
(
pubIds
.
length
==
1
)
{
if
(
pubIds
.
length
==
1
)
{
if
(
success
>
0
)
{
if
(
success
>
0
)
{
...
@@ -192,17 +197,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
...
@@ -192,17 +197,16 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
return
Rest
.
ok
(
msg
);
return
Rest
.
ok
(
msg
);
}
}
private
Boolean
updateOrSave
(
PubdatumEntity
pubdatumEntity
,
Long
matterId
,
Long
siteId
,
Context
context
)
{
private
MatterDatumEntity
updateOrSave
(
PubdatumEntity
pubdatumEntity
,
Long
matterId
,
Long
siteId
,
Context
context
)
{
MatterDatumEntity
matterDatumEntity
=
this
.
selectOne
(
new
MatterDatumQuery
().
siteId
(
siteId
).
matterId
(
matterId
).
materialName
(
pubdatumEntity
.
getMaterialName
()));
MatterDatumEntity
matterDatumEntity
=
this
.
selectOne
(
new
MatterDatumQuery
().
siteId
(
siteId
).
matterId
(
matterId
).
materialName
(
pubdatumEntity
.
getMaterialName
()));
if
(
ObjectUtils
.
isEmpty
(
matterDatumEntity
))
{
if
(
ObjectUtils
.
isEmpty
(
matterDatumEntity
))
{
MatterDatumEntity
entity
=
new
MatterDatumEntity
();
MatterDatumEntity
entity
=
new
MatterDatumEntity
();
BeanUtils
.
copyProperties
(
pubdatumEntity
,
entity
,
new
String
[]{
"id"
,
"matterId"
});
BeanUtils
.
copyProperties
(
pubdatumEntity
,
entity
,
new
String
[]{
"id"
,
"matterId"
});
entity
.
setSiteId
(
siteId
);
entity
.
setSiteId
(
siteId
);
entity
.
setMatterId
(
matterId
);
entity
.
setMatterId
(
matterId
);
this
.
save
(
entity
,
context
);
return
entity
;
return
true
;
}
}
return
false
;
return
null
;
}
}
@Override
@Override
...
...
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @
2d3bed33
...
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -57,15 +58,20 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
...
@@ -57,15 +58,20 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
}
}
int
success
=
0
;
int
success
=
0
;
int
fail
=
0
;
int
fail
=
0
;
List
<
MatterEntity
>
matterEntities
=
new
ArrayList
<>();
List
<
SheetMatterEntity
>
sheetMatterEntityList
=
sheetMatterService
.
get
(
sheetMatterIds
,
context
);
List
<
SheetMatterEntity
>
sheetMatterEntityList
=
sheetMatterService
.
get
(
sheetMatterIds
,
context
);
for
(
SheetMatterEntity
sheetMatterEntity
:
sheetMatterEntityList
)
{
for
(
SheetMatterEntity
sheetMatterEntity
:
sheetMatterEntityList
)
{
Boolean
bool
=
updateOrSave
(
sheetMatterEntity
,
siteId
,
context
);
MatterEntity
matterEntity
=
updateOrSave
(
sheetMatterEntity
,
siteId
,
context
);
if
(
bool
)
{
if
(!
ObjectUtils
.
isEmpty
(
matterEntity
))
{
matterEntities
.
add
(
matterEntity
);
success
++;
success
++;
}
else
{
}
else
{
fail
++;
fail
++;
}
}
}
}
if
(!
ObjectUtils
.
isEmpty
(
matterEntities
))
{
this
.
save
(
matterEntities
,
context
);
}
String
msg
=
"当前加入事项已存在!"
;
String
msg
=
"当前加入事项已存在!"
;
if
(
sheetMatterIds
.
length
==
1
)
{
if
(
sheetMatterIds
.
length
==
1
)
{
if
(
success
>
0
)
{
if
(
success
>
0
)
{
...
@@ -83,7 +89,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
...
@@ -83,7 +89,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
return
Rest
.
ok
(
msg
);
return
Rest
.
ok
(
msg
);
}
}
private
Boolean
updateOrSave
(
SheetMatterEntity
sheetMatterEntity
,
Long
siteId
,
Context
context
)
{
private
MatterEntity
updateOrSave
(
SheetMatterEntity
sheetMatterEntity
,
Long
siteId
,
Context
context
)
{
MatterEntity
siteMatterEntity
=
this
.
selectOne
(
new
MatterQuery
().
siteId
(
siteId
).
tcode
(
sheetMatterEntity
.
getTcode
()));
MatterEntity
siteMatterEntity
=
this
.
selectOne
(
new
MatterQuery
().
siteId
(
siteId
).
tcode
(
sheetMatterEntity
.
getTcode
()));
if
(
ObjectUtils
.
isEmpty
(
siteMatterEntity
))
{
if
(
ObjectUtils
.
isEmpty
(
siteMatterEntity
))
{
MatterEntity
matterEntity
=
new
MatterEntity
();
MatterEntity
matterEntity
=
new
MatterEntity
();
...
@@ -100,10 +106,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
...
@@ -100,10 +106,9 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
matterEntity
.
setSource
(
MatterSourceEnum
.
AUTO
.
getValue
());
matterEntity
.
setSource
(
MatterSourceEnum
.
AUTO
.
getValue
());
matterEntity
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
matterEntity
.
setCreateUserId
(
this
.
getContextUserId
(
context
));
matterEntity
.
setCreateTime
(
new
Date
());
matterEntity
.
setCreateTime
(
new
Date
());
this
.
save
(
matterEntity
,
context
);
return
matterEntity
;
return
true
;
}
}
return
false
;
return
null
;
}
}
@Override
@Override
...
@@ -112,7 +117,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
...
@@ -112,7 +117,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
if
(
matterEntity
==
null
)
{
if
(
matterEntity
==
null
)
{
throw
new
AppException
(
"数据已更改,请重试"
);
throw
new
AppException
(
"数据已更改,请重试"
);
}
}
String
msg
=
"推荐成功!"
;
String
msg
=
"推荐成功!"
;
int
recommendCount
=
this
.
count
(
new
MatterQuery
().
siteId
(
matterEntity
.
getSiteId
()).
isRecommend
(
YesNoEnum
.
YES
.
getValue
()),
null
);
int
recommendCount
=
this
.
count
(
new
MatterQuery
().
siteId
(
matterEntity
.
getSiteId
()).
isRecommend
(
YesNoEnum
.
YES
.
getValue
()),
null
);
if
(
matterEntity
.
getIsRecommend
()
==
YesNoEnum
.
NO
.
getValue
())
{
if
(
matterEntity
.
getIsRecommend
()
==
YesNoEnum
.
NO
.
getValue
())
{
if
(
recommendCount
>=
RECOMMEND_COUNT
)
{
if
(
recommendCount
>=
RECOMMEND_COUNT
)
{
...
@@ -121,7 +126,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
...
@@ -121,7 +126,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
matterEntity
.
setIsRecommend
(
YesNoEnum
.
YES
.
getValue
());
matterEntity
.
setIsRecommend
(
YesNoEnum
.
YES
.
getValue
());
}
else
{
}
else
{
matterEntity
.
setIsRecommend
(
YesNoEnum
.
NO
.
getValue
());
matterEntity
.
setIsRecommend
(
YesNoEnum
.
NO
.
getValue
());
msg
=
"取消推荐成功!"
;
msg
=
"取消推荐成功!"
;
}
}
this
.
update
(
matterEntity
,
context
);
this
.
update
(
matterEntity
,
context
);
return
Rest
.
ok
(
msg
);
return
Rest
.
ok
(
msg
);
...
...
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