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
714eaffe
Commit
714eaffe
authored
Dec 18, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.3-shuiyou 增减接口
parent
521b4b03
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
64 additions
and
15 deletions
+64
-15
SysHouseHoldInfo.java
...fu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
+9
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+11
-0
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+20
-2
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+6
-7
application-dev.yml
...al/yifu-social-biz/src/main/resources/application-dev.yml
+8
-1
SysHouseHoldInfoMapper.xml
...-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
+3
-1
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+7
-4
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysHouseHoldInfo.java
View file @
714eaffe
...
@@ -269,6 +269,15 @@ public class SysHouseHoldInfo extends BaseEntity {
...
@@ -269,6 +269,15 @@ public class SysHouseHoldInfo extends BaseEntity {
@Schema
(
description
=
"自动化配置状态"
)
@Schema
(
description
=
"自动化配置状态"
)
private
String
autoStatus
;
private
String
autoStatus
;
/**
* 医保单位编号
*/
@ExcelAttribute
(
name
=
"医保单位编号"
)
@Schema
(
description
=
"医保单位编号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保单位编号"
)
private
String
customerNoYsd
;
/**
/**
* 审核人部门
* 审核人部门
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
714eaffe
...
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
...
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
/**
* @Author hgw
* @Author hgw
...
@@ -33,6 +34,8 @@ public class SociaFriendYgsAddVo implements Serializable {
...
@@ -33,6 +34,8 @@ public class SociaFriendYgsAddVo implements Serializable {
private
String
mediclPassword
;
private
String
mediclPassword
;
// "单位编号"
// "单位编号"
private
String
customerNo
;
private
String
customerNo
;
// "单位编号" 医保
private
String
customerNoYsd
;
@ExcelProperty
(
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
empName
;
private
String
empName
;
@ExcelProperty
(
"员工身份证"
)
@ExcelProperty
(
"员工身份证"
)
...
@@ -87,6 +90,14 @@ public class SociaFriendYgsAddVo implements Serializable {
...
@@ -87,6 +90,14 @@ public class SociaFriendYgsAddVo implements Serializable {
private
String
socialCity
;
private
String
socialCity
;
private
String
socialTown
;
private
String
socialTown
;
@ExcelProperty
(
"单位医疗金额标志,1有,0无"
)
private
Integer
unitMedicalMoney
;
@ExcelProperty
(
"单位生育金额标志,1有,0无"
)
private
Integer
unitBirthMoney
;
@ExcelProperty
(
"单位大病救助金额标志,1有,0无"
)
private
Integer
unitBigailmentMoney
;
@ExcelProperty
(
"派单类型"
)
@ExcelProperty
(
"派单类型"
)
private
String
type
;
private
String
type
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
714eaffe
...
@@ -129,7 +129,8 @@ public class SocialFriendConfig {
...
@@ -129,7 +129,8 @@ public class SocialFriendConfig {
JSONObject
jsonYwblzhlbYsd
=
new
JSONObject
();
JSONObject
jsonYwblzhlbYsd
=
new
JSONObject
();
jsonYwblzhlbYsd
.
put
(
"mm"
,
vo
.
getMediclPassword
());
jsonYwblzhlbYsd
.
put
(
"mm"
,
vo
.
getMediclPassword
());
jsonYwblzhlbYsd
.
put
(
"blxm"
,
"医保"
);
jsonYwblzhlbYsd
.
put
(
"blxm"
,
"医保"
);
jsonYwblzhlbYsd
.
put
(
"dwbh"
,
vo
.
getCustomerNo
());
//jsonYwblzhlbYsd.put("dwbh", "34010000000000333471")
jsonYwblzhlbYsd
.
put
(
"dwbh"
,
vo
.
getCustomerNoYsd
());
jsonYwblzhlbYsd
.
put
(
"zh"
,
vo
.
getMediclAccount
());
jsonYwblzhlbYsd
.
put
(
"zh"
,
vo
.
getMediclAccount
());
jsonYwblzhlbYsd
.
put
(
"mmlx"
,
"4"
);
jsonYwblzhlbYsd
.
put
(
"mmlx"
,
"4"
);
ywblzhlbArr
.
add
(
jsonYwblzhlbYsd
);
ywblzhlbArr
.
add
(
jsonYwblzhlbYsd
);
...
@@ -305,7 +306,24 @@ public class SocialFriendConfig {
...
@@ -305,7 +306,24 @@ public class SocialFriendConfig {
String
xzlb
=
"企业职工养老,工伤保险,失业保险"
;
String
xzlb
=
"企业职工养老,工伤保险,失业保险"
;
if
(
type
>
2
)
{
if
(
type
>
2
)
{
blxm
=
"医保"
;
blxm
=
"医保"
;
xzlb
=
"职工基本医疗保险,生育保险,大额医疗"
;
xzlb
=
null
;
if
(
Common
.
isNotNull
(
vo
.
getUnitMedicalMoney
())
&&
CommonConstants
.
ONE_INTEGER
.
equals
(
vo
.
getUnitMedicalMoney
()))
{
xzlb
=
"职工基本医疗保险"
;
}
if
(
Common
.
isNotNull
(
vo
.
getUnitBirthMoney
())
&&
CommonConstants
.
ONE_INTEGER
.
equals
(
vo
.
getUnitBirthMoney
()))
{
if
(
Common
.
isNotNull
(
xzlb
))
{
xzlb
+=
",生育保险"
;
}
else
{
xzlb
=
"生育保险"
;
}
}
if
(
Common
.
isNotNull
(
vo
.
getUnitBigailmentMoney
())
&&
CommonConstants
.
ONE_INTEGER
.
equals
(
vo
.
getUnitBigailmentMoney
()))
{
if
(
Common
.
isNotNull
(
xzlb
))
{
xzlb
+=
",大额医疗"
;
}
else
{
xzlb
=
"大额医疗"
;
}
}
}
}
String
[]
strArr
=
xzlb
.
split
(
","
);
String
[]
strArr
=
xzlb
.
split
(
","
);
// 办理项目
// 办理项目
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
714eaffe
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.social.config.SocialFriendConfig
;
import
com.yifu.cloud.plus.v1.yifu.social.config.SocialFriendConfig
;
...
@@ -162,8 +161,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -162,8 +161,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// 记录日志
// 记录日志
TSocialSoldierLog
socialLog
;
TSocialSoldierLog
socialLog
;
// 初始化继续办理
// 初始化继续办理
ygsHandleStatus
=
CommonConstants
.
T
HREE
_STRING
;
ygsHandleStatus
=
CommonConstants
.
T
WO
_STRING
;
ysdHandleStatus
=
CommonConstants
.
T
HREE
_STRING
;
ysdHandleStatus
=
CommonConstants
.
T
WO
_STRING
;
title
=
"社保"
;
title
=
"社保"
;
updateSocial
=
new
TSocialInfo
();
updateSocial
=
new
TSocialInfo
();
...
@@ -203,7 +202,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -203,7 +202,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
ygsFailList
=
new
ArrayList
<>();
ygsFailList
=
new
ArrayList
<>();
ygsFailList
.
add
(
socialInfo
.
getDispatchId
());
ygsFailList
.
add
(
socialInfo
.
getDispatchId
());
handleRemark
=
"中止办理:"
+
failConfig
.
getSimpleReason
();
handleRemark
=
"中止办理:"
+
failConfig
.
getSimpleReason
();
remark
=
"中止办理:"
+
failConfig
.
getSimpleReason
()
;
remark
=
handleRemark
;
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
...
@@ -276,7 +275,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -276,7 +275,7 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
ysdHandleStatus
=
CommonConstants
.
FOUR_STRING
;
ysdHandleStatus
=
CommonConstants
.
FOUR_STRING
;
ysdFailList
.
add
(
socialInfo
.
getDispatchId
());
ysdFailList
.
add
(
socialInfo
.
getDispatchId
());
handleRemark
=
"中止办理:"
+
failConfig
.
getSimpleReason
();
handleRemark
=
"中止办理:"
+
failConfig
.
getSimpleReason
();
remark
=
"中止办理:"
+
failConfig
.
getSimpleReason
()
;
remark
=
handleRemark
;
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
// 新增流程进展明细
// 新增流程进展明细
...
@@ -414,9 +413,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -414,9 +413,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
* @Author hgw
* @Author hgw
* @Date 2024-5-11 17:03:12
* @Date 2024-5-11 17:03:12
**/
**/
p
ublic
R
<
List
<
ErrorMessage
>>
doSocialAndDispatch
(
List
<
String
>
idList
,
String
typeSub
,
String
handleStatus
p
rivate
void
doSocialAndDispatch
(
List
<
String
>
idList
,
String
typeSub
,
String
handleStatus
,
String
handleRemark
,
String
socialType
,
String
remark
,
YifuUser
user
)
{
,
String
handleRemark
,
String
socialType
,
String
remark
,
YifuUser
user
)
{
return
tDispatchInfoService
.
addApplyHandle
(
idList
,
typeSub
,
handleStatus
,
handleRemark
,
socialType
,
remark
,
user
,
true
);
tDispatchInfoService
.
addApplyHandle
(
idList
,
typeSub
,
handleStatus
,
handleRemark
,
socialType
,
remark
,
user
,
true
);
}
}
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
View file @
714eaffe
...
@@ -62,11 +62,18 @@ soldier:
...
@@ -62,11 +62,18 @@ soldier:
#税友相关属性配置
#税友相关属性配置
socialFriend
:
socialFriend
:
#测试
urlPre
:
https://test-openapi.17win.com
urlPre
:
https://test-openapi.17win.com
#线上
#urlPre : https://openapi.17win.com
urlPushAdd
:
/gateway/socins/hrss/employee/v2/register
urlPushAdd
:
/gateway/socins/hrss/employee/v2/register
urlGetInfoAdd
:
/gateway/socins/hrss/employee/v2/getRegisterFeedback
urlGetInfoAdd
:
/gateway/socins/hrss/employee/v2/getRegisterFeedback
urlPushReduce
:
/gateway/socins/hrss/employee/v2/stop
urlPushReduce
:
/gateway/socins/hrss/employee/v2/stop
urlGetInfoReduce
:
/gateway/socins/hrss/employee/v2/getStopFeedback
urlGetInfoReduce
:
/gateway/socins/hrss/employee/v2/getStopFeedback
urlUpload
:
/gateway/file/upload
urlUpload
:
/gateway/file/upload
#测试
appKey
:
89357285571962202409230949030
appKey
:
89357285571962202409230949030
appSecret
:
V52dkvxtFUgIvzlfNE9G8g==
appSecret
:
V52dkvxtFUgIvzlfNE9G8g==
\ No newline at end of file
#线上
#appKey : 3082B14EE2114C2D93B3A222DD925C26=
#appSecret : VmURqoxqmoKnNLXzAWynqQ==
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
View file @
714eaffe
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
<result
property=
"socialPassword"
column=
"SOCIAL_PASSWORD"
/>
<result
property=
"socialPassword"
column=
"SOCIAL_PASSWORD"
/>
<result
property=
"mediclPassword"
column=
"MEDICL_PASSWORD"
/>
<result
property=
"mediclPassword"
column=
"MEDICL_PASSWORD"
/>
<result
property=
"isSign"
column=
"IS_SIGN"
/>
<result
property=
"isSign"
column=
"IS_SIGN"
/>
<result
property=
"customerNoYsd"
column=
"CUSTOMER_NO_YSD"
/>
</resultMap>
</resultMap>
<resultMap
id=
"sysHouseHoldSingleInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo"
>
<resultMap
id=
"sysHouseHoldSingleInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo"
>
...
@@ -95,7 +96,8 @@
...
@@ -95,7 +96,8 @@
a.MEDICL_ACCOUNT,
a.MEDICL_ACCOUNT,
a.SOCIAL_PASSWORD,
a.SOCIAL_PASSWORD,
a.MEDICL_PASSWORD,
a.MEDICL_PASSWORD,
a.IS_SIGN
a.IS_SIGN,
a.CUSTOMER_NO_YSD
</sql>
</sql>
<sql
id=
"sysHouseHoldInfo_where"
>
<sql
id=
"sysHouseHoldInfo_where"
>
<if
test=
"sysHouseHoldInfo != null"
>
<if
test=
"sysHouseHoldInfo != null"
>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
714eaffe
...
@@ -36,6 +36,7 @@
...
@@ -36,6 +36,7 @@
shh.MEDICL_ACCOUNT mediclAccount,
shh.MEDICL_ACCOUNT mediclAccount,
shh.MEDICL_PASSWORD mediclPassword,
shh.MEDICL_PASSWORD mediclPassword,
shh.CUSTOMER_NO customerNo,
shh.CUSTOMER_NO customerNo,
shh.CUSTOMER_NO_YSD customerNoYsd,
a.EMP_NAME empName,
a.EMP_NAME empName,
a.EMP_IDCARD empIdcard,
a.EMP_IDCARD empIdcard,
if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational,
if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational,
...
@@ -105,7 +106,7 @@
...
@@ -105,7 +106,7 @@
<select
id=
"getSocialSoldierYgsAddVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"
>
<select
id=
"getSocialSoldierYgsAddVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"
>
<include
refid=
"getSocialSoldierBaseOne"
/>
<include
refid=
"getSocialSoldierBaseOne"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','
2','
3')
and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3')
and (
and (
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_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.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '0' or
...
@@ -137,7 +138,7 @@
...
@@ -137,7 +138,7 @@
<select
id=
"getSocialSoldierYgsReduceVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"
>
<select
id=
"getSocialSoldierYgsReduceVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"
>
<include
refid=
"getSocialSoldierBaseOne"
/>
<include
refid=
"getSocialSoldierBaseOne"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','
2','
3')
and a.type = '1' and s.YGS_HANDLE_STATUS in ('0','1','3')
and (
and (
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.PENSION_HANDLE,s.PENSION_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.WORK_INJURY_HANDLE,s.WORK_INJURY_HANDLE) = '5' or
...
@@ -149,8 +150,9 @@
...
@@ -149,8 +150,9 @@
<!-- 税友医生大增加模板-->
<!-- 税友医生大增加模板-->
<select
id=
"getSocialSoldierYsdAddVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"
>
<select
id=
"getSocialSoldierYsdAddVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"
>
<include
refid=
"getSocialSoldierBaseOne"
/>
<include
refid=
"getSocialSoldierBaseOne"
/>
,if(s.UNIT_MEDICAL_MONEY != 0,1,0) unitMedicalMoney,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney,if(s.UNIT_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney
<include
refid=
"getSocialSoldierBaseTwo"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','
2','
3')
and a.type = '0' and s.YSD_HANDLE_STATUS in ('0','1','3')
and (
and (
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '0' or
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '0' or
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
...
@@ -172,6 +174,7 @@
...
@@ -172,6 +174,7 @@
shh.MEDICL_ACCOUNT mediclAccount,
shh.MEDICL_ACCOUNT mediclAccount,
shh.MEDICL_PASSWORD mediclPassword,
shh.MEDICL_PASSWORD mediclPassword,
shh.CUSTOMER_NO customerNo,
shh.CUSTOMER_NO customerNo,
shh.CUSTOMER_NO_YSD customerNoYsd,
a.EMP_NAME empName,
a.EMP_NAME empName,
a.EMP_IDCARD empIdcard,
a.EMP_IDCARD empIdcard,
if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational,
if (a.EMP_NATIONAL in ('2','3','5','6','7','8','9','11') and nation.label is not null, nation.label,'汉族') empNational,
...
@@ -222,7 +225,7 @@
...
@@ -222,7 +225,7 @@
s.SOCIAL_CITY socialCity,
s.SOCIAL_CITY socialCity,
s.SOCIAL_TOWN socialTown
s.SOCIAL_TOWN socialTown
<include
refid=
"getSocialSoldierBaseTwo"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','
2','
3')
and a.type = '1' and s.YSD_HANDLE_STATUS in ('0','1','3')
and (
and (
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '5' or
if(ifnull(h.id,0) != '0',h.MEDICAL_HANDLE,s.MEDICAL_HANDLE) = '5' or
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
...
...
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