Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
a6acd93a
Commit
a6acd93a
authored
Apr 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.10' into MVP1.7.10
parents
9f8318e2
e3b13b9c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
FundImportHandleVo.java
...yifu/cloud/plus/v1/yifu/social/vo/FundImportHandleVo.java
+1
-1
SocialImportHandleVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialImportHandleVo.java
+1
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-2
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+9
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/FundImportHandleVo.java
View file @
a6acd93a
...
@@ -73,7 +73,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
...
@@ -73,7 +73,7 @@ public class FundImportHandleVo extends RowIndex implements Serializable {
/**
/**
* 派单类型 0 派增 1 派减
* 派单类型 0 派增 1 派减
*/
*/
@ExcelAttribute
(
name
=
"派单类型"
,
isNotEmpty
=
true
)
@ExcelAttribute
(
name
=
"派单类型"
,
isNotEmpty
=
true
,
isDataId
=
true
,
readConverterExp
=
"0=派增,1=派减"
,
errorInfo
=
"派单类型不可为空"
)
@Schema
(
description
=
"派单类型 0 派增 1 派减"
)
@Schema
(
description
=
"派单类型 0 派增 1 派减"
)
@ExcelProperty
(
"派单类型"
)
@ExcelProperty
(
"派单类型"
)
private
String
type
;
private
String
type
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialImportHandleVo.java
View file @
a6acd93a
...
@@ -117,7 +117,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
...
@@ -117,7 +117,7 @@ public class SocialImportHandleVo extends RowIndex implements Serializable {
/**
/**
* 派单类型 0 派增 1 派减
* 派单类型 0 派增 1 派减
*/
*/
@ExcelAttribute
(
name
=
"派单类型"
,
isNotEmpty
=
true
)
@ExcelAttribute
(
name
=
"派单类型"
,
isNotEmpty
=
true
,
isDataId
=
true
,
readConverterExp
=
"0=派增,1=派减"
,
errorInfo
=
"派单类型不可为空"
)
@Schema
(
description
=
"派单类型 0 派增 1 派减"
)
@Schema
(
description
=
"派单类型 0 派增 1 派减"
)
@ExcelProperty
(
"派单类型"
)
@ExcelProperty
(
"派单类型"
)
private
String
type
;
private
String
type
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
a6acd93a
...
@@ -6203,7 +6203,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6203,7 +6203,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
dispatch
=
dispatchMap
.
get
(
excel
.
getEmpIdcard
());
dispatch
=
dispatchMap
.
get
(
excel
.
getEmpIdcard
());
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if
(
Common
.
isEmpty
(
dispatch
)
||
excel
.
getType
().
equals
(
dispatch
.
getType
()))
{
if
(
Common
.
isEmpty
(
dispatch
)
||
!
excel
.
getType
().
equals
(
dispatch
.
getType
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
FUND_IMPORT_HANDLE_NOT_EXITS
),
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
FUND_IMPORT_HANDLE_NOT_EXITS
),
excel
));
continue
;
continue
;
}
}
...
@@ -6370,7 +6370,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -6370,7 +6370,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
=
dispatchMap
.
get
(
excel
.
getEmpIdcard
());
dispatch
=
dispatchMap
.
get
(
excel
.
getEmpIdcard
());
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10
//批量办理增加派单类型 fxj 2025-04-24 V1.7.10
if
(
Common
.
isEmpty
(
dispatch
)
||
excel
.
getType
().
equals
(
dispatch
.
getType
()))
{
if
(
Common
.
isEmpty
(
dispatch
)
||
!
excel
.
getType
().
equals
(
dispatch
.
getType
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
SOCIAL_IMPORT_HANDLE_NOT_EXITS
),
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
SOCIAL_IMPORT_HANDLE_NOT_EXITS
),
excel
));
continue
;
continue
;
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
a6acd93a
...
@@ -1951,6 +1951,9 @@
...
@@ -1951,6 +1951,9 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.trustRemark != null and tDispatchInfo.trustRemark.trim() != ''"
>
AND a.TRUST_REMARK = #{tDispatchInfo.trustRemark}
</if>
<if
test=
"tDispatchInfo.empTypeList != null and tDispatchInfo.empTypeList.length>0"
>
<if
test=
"tDispatchInfo.empTypeList != null and tDispatchInfo.empTypeList.length>0"
>
AND a.EMP_TYPE IN
AND a.EMP_TYPE IN
<foreach
collection=
"tDispatchInfo.empTypeList"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
<foreach
collection=
"tDispatchInfo.empTypeList"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
...
@@ -2058,6 +2061,9 @@
...
@@ -2058,6 +2061,9 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.trustRemark != null and tDispatchInfo.trustRemark.trim() != ''"
>
AND a.TRUST_REMARK = #{tDispatchInfo.trustRemark}
</if>
<if
test=
"tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"
>
<if
test=
"tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"
>
AND
AND
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfo.dispatchItems"
open=
"("
separator=
"or"
close=
")"
>
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfo.dispatchItems"
open=
"("
separator=
"or"
close=
")"
>
...
@@ -2181,6 +2187,9 @@
...
@@ -2181,6 +2187,9 @@
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.trustRemark != null and tDispatchInfo.trustRemark.trim() != ''"
>
AND a.TRUST_REMARK = #{tDispatchInfo.trustRemark}
</if>
<if
test=
"tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"
>
<if
test=
"tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0"
>
AND
AND
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfo.dispatchItems"
open=
"("
separator=
"or"
close=
")"
>
<foreach
item=
"item"
index=
"index"
collection=
"tDispatchInfo.dispatchItems"
open=
"("
separator=
"or"
close=
")"
>
...
...
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