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
11cc3941
Commit
11cc3941
authored
May 15, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化
parent
0ea6a843
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
14 deletions
+17
-14
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+7
-6
TSocialInfoMapper.xml
...ocial-biz/src/main/resources/mapper/TSocialInfoMapper.xml
+2
-8
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+8
-0
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
11cc3941
...
@@ -101,11 +101,12 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -101,11 +101,12 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
for
(
TSocialInfo
socialInfo
:
socialList
)
{
for
(
TSocialInfo
socialInfo
:
socialList
)
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsAddId
()))
{
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
addIdSet
.
add
(
socialInfo
.
getYgsAddId
());
idCardMap
.
put
(
socialInfo
.
getYgsAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
}
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
if
(
Common
.
isNotNull
(
socialInfo
.
getYsdAddId
()))
{
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
addIdSet
.
add
(
socialInfo
.
getYsdAddId
());
idCardMap
.
put
(
socialInfo
.
getYsdAddId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
}
idCardMap
.
put
(
socialInfo
.
getEmpIdcard
(),
socialInfo
);
}
}
HttpURLConnection
conn
;
HttpURLConnection
conn
;
InputStream
in
=
null
;
InputStream
in
=
null
;
...
@@ -133,7 +134,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -133,7 +134,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
conn
.
setConnectTimeout
(
30
*
1000
);
conn
.
setConnectTimeout
(
30
*
1000
);
in
=
conn
.
getInputStream
();
in
=
conn
.
getInputStream
();
// 实际读取文件内容
// 实际读取文件内容
this
.
readXls
(
in
,
idCardMap
,
errorMap
);
this
.
readXls
(
in
,
idCardMap
,
errorMap
,
doAddId
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
...
@@ -153,7 +154,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -153,7 +154,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
public
R
<
List
<
TSocialSoldierReturnErrorVo
>>
readXls
(
InputStream
inputStream
,
Map
<
String
,
TSocialInfo
>
idCardMap
public
R
<
List
<
TSocialSoldierReturnErrorVo
>>
readXls
(
InputStream
inputStream
,
Map
<
String
,
TSocialInfo
>
idCardMap
,
Map
<
String
,
FailReasonConfig
>
errorMap
)
{
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
doAddId
)
{
TSocialSoldierReturnErrorVo
vo
;
TSocialSoldierReturnErrorVo
vo
;
List
<
TSocialSoldierReturnErrorVo
>
voList
=
new
ArrayList
<>();
List
<
TSocialSoldierReturnErrorVo
>
voList
=
new
ArrayList
<>();
HSSFWorkbook
sheets
=
null
;
HSSFWorkbook
sheets
=
null
;
...
@@ -290,7 +291,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -290,7 +291,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
}
}
if
(!
voList
.
isEmpty
())
{
if
(!
voList
.
isEmpty
())
{
importTSocialInfo
(
voList
,
idCardMap
,
errorMap
);
importTSocialInfo
(
voList
,
idCardMap
,
errorMap
,
doAddId
);
}
}
return
R
.
ok
(
voList
);
return
R
.
ok
(
voList
);
}
}
...
@@ -380,7 +381,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -380,7 +381,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}*/
}*/
private
void
importTSocialInfo
(
List
<
TSocialSoldierReturnErrorVo
>
excelVOList
,
Map
<
String
,
TSocialInfo
>
idCardMap
private
void
importTSocialInfo
(
List
<
TSocialSoldierReturnErrorVo
>
excelVOList
,
Map
<
String
,
TSocialInfo
>
idCardMap
,
Map
<
String
,
FailReasonConfig
>
errorMap
)
{
,
Map
<
String
,
FailReasonConfig
>
errorMap
,
String
doAddId
)
{
// 个性化校验逻辑
// 个性化校验逻辑
// 执行数据插入操作 组装
// 执行数据插入操作 组装
TSocialSoldierReturnErrorVo
excel
;
TSocialSoldierReturnErrorVo
excel
;
...
@@ -416,7 +417,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -416,7 +417,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 初始化继续办理
// 初始化继续办理
ygsHandleStatus
=
CommonConstants
.
THREE_STRING
;
ygsHandleStatus
=
CommonConstants
.
THREE_STRING
;
ysdHandleStatus
=
CommonConstants
.
THREE_STRING
;
ysdHandleStatus
=
CommonConstants
.
THREE_STRING
;
socialInfo
=
idCardMap
.
get
(
empIdCard
);
socialInfo
=
idCardMap
.
get
(
doAddId
+
CommonConstants
.
DOWN_LINE_STRING
+
empIdCard
);
if
(
socialInfo
!=
null
)
{
if
(
socialInfo
!=
null
)
{
if
(
typeFlag
&&
if
(
typeFlag
&&
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @
11cc3941
...
@@ -593,11 +593,8 @@
...
@@ -593,11 +593,8 @@
d.id as DISPATCH_ID
d.id as DISPATCH_ID
FROM t_social_info a
FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id
left join t_dispatch_info d on d.SOCIAL_ID = a.id
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(d.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
where a.YGS_ADD_ID is not null and d.AUTO_FLAG='0' and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and sd.PROVINCE=a.SOCIAL_PROVINCE and sd.CITY=a.SOCIAL_CITY and ( (a.SOCIAL_TOWN is null and sd.TOWN is null) or (sd.TOWN=a.SOCIAL_TOWN))
where a.YGS_ADD_ID is not null and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and a.YGS_HANDLE_STATUS in ('1','2','3')
and a.YGS_HANDLE_STATUS in ('1','2','3')
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.SOCIAL_END_DATE)
group by a.id
group by a.id
</select>
</select>
...
@@ -612,11 +609,8 @@
...
@@ -612,11 +609,8 @@
d.id as DISPATCH_ID
d.id as DISPATCH_ID
FROM t_social_info a
FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id
left join t_dispatch_info d on d.SOCIAL_ID = a.id
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(d.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
where a.YSD_ADD_ID is not null and d.AUTO_FLAG='0' and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and sd.PROVINCE=a.SOCIAL_PROVINCE and sd.CITY=a.SOCIAL_CITY and ( (a.SOCIAL_TOWN is null and sd.TOWN is null) or (sd.TOWN=a.SOCIAL_TOWN))
where a.YSD_ADD_ID is not null and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and a.YSD_HANDLE_STATUS in ('1','2','3')
and a.YSD_HANDLE_STATUS in ('1','2','3')
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.MEDICAL_END_DATE)
group by a.id
group by a.id
</select>
</select>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
11cc3941
...
@@ -93,7 +93,11 @@
...
@@ -93,7 +93,11 @@
left join sys_area sc2 on sc2.id = s.SOCIAL_CITY
left join sys_area sc2 on sc2.id = s.SOCIAL_CITY
left join sys_area st1 on st1.id = h.SOCIAL_TOWN
left join sys_area st1 on st1.id = h.SOCIAL_TOWN
left join sys_area st2 on st2.id = s.SOCIAL_TOWN
left join sys_area st2 on st2.id = s.SOCIAL_TOWN
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(a.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
and sd.PROVINCE=s.SOCIAL_PROVINCE and sd.CITY=a.SOCIAL_CITY and ( (s.SOCIAL_TOWN is null and sd.TOWN is null) or (sd.TOWN=s.SOCIAL_TOWN))
<include
refid=
"where_getSocialSoldier_base_handler"
/>
<include
refid=
"where_getSocialSoldier_base_handler"
/>
and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and (sd.id is null or NOW()
<![CDATA[ <= ]]>
sd.SOCIAL_END_DATE)
</sql>
</sql>
<!-- 社保士兵养工失增加模板-->
<!-- 社保士兵养工失增加模板-->
...
@@ -105,6 +109,7 @@
...
@@ -105,6 +109,7 @@
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '0'
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '0'
)
)
group by a.id
</select>
</select>
<sql
id=
"where_getSocialSoldier_base_handler"
>
<sql
id=
"where_getSocialSoldier_base_handler"
>
...
@@ -135,6 +140,7 @@
...
@@ -135,6 +140,7 @@
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '5'
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '5'
)
)
group by a.id
</select>
</select>
<!-- 社保士兵医生大增加模板-->
<!-- 社保士兵医生大增加模板-->
...
@@ -146,6 +152,7 @@
...
@@ -146,6 +152,7 @@
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '0'
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '0'
)
)
group by a.id
</select>
</select>
<!-- 社保士兵医生大减少模板-->
<!-- 社保士兵医生大减少模板-->
...
@@ -157,6 +164,7 @@
...
@@ -157,6 +164,7 @@
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.BIRTH_HANDLE,s.BIRTH_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '5'
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '5'
)
)
group by a.id
</select>
</select>
</mapper>
</mapper>
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