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
5de2de7d
Commit
5de2de7d
authored
Mar 13, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
f85b53b1
c4d31c10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
109 additions
and
12 deletions
+109
-12
TFascTemplateController.java
.../v1/yifu/archives/controller/TFascTemplateController.java
+8
-1
TFascTemplateMapper.java
...oud/plus/v1/yifu/archives/mapper/TFascTemplateMapper.java
+3
-0
TFascTemplateService.java
...d/plus/v1/yifu/archives/service/TFascTemplateService.java
+8
-3
TFascTemplateServiceImpl.java
.../yifu/archives/service/impl/TFascTemplateServiceImpl.java
+5
-0
TFascTemplateMapper.xml
...ves-biz/src/main/resources/mapper/TFascTemplateMapper.xml
+14
-1
TSpecialDeducationSum.java
...oud/plus/v1/yifu/salary/entity/TSpecialDeducationSum.java
+13
-0
TSpecialDeducationSumMapper.xml
...src/main/resources/mapper/TSpecialDeducationSumMapper.xml
+6
-0
SociaFriendYgsAddVo.java
...ifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
+3
-0
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+47
-7
TSocialFriendMapper.xml
...ial-biz/src/main/resources/mapper/TSocialFriendMapper.xml
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TFascTemplateController.java
View file @
5de2de7d
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascEditLog
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascEditLog
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplateDetail
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascEditLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascEditLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateDetailService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateDetailService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascTemplateService
;
...
@@ -87,6 +86,14 @@ public class TFascTemplateController {
...
@@ -87,6 +86,14 @@ public class TFascTemplateController {
return
R
.
ok
(
tFascTemplateService
.
noPageDiy
(
tFascTemplate
));
return
R
.
ok
(
tFascTemplateService
.
noPageDiy
(
tFascTemplate
));
}
}
/** 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
*/
@Operation
(
summary
=
"获取签署方的下拉框,模糊搜索,去重,皖信放第一位"
,
description
=
"获取签署方的下拉框,模糊搜索,去重,皖信放第一位"
)
@GetMapping
(
"/getSignNameList"
)
public
R
<
List
<
String
>>
getSignNameList
(
@RequestParam
String
signName
)
{
return
R
.
ok
(
tFascTemplateService
.
getSignNameList
(
signName
));
}
/**
/**
* 通过id查询法大大专业版模板表
* 通过id查询法大大专业版模板表
*
*
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TFascTemplateMapper.java
View file @
5de2de7d
...
@@ -58,4 +58,7 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> {
...
@@ -58,4 +58,7 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> {
**/
**/
List
<
TFascTemplate
>
getTFascTemplateResutList
(
@Param
(
"templateId"
)
String
templateId
);
List
<
TFascTemplate
>
getTFascTemplateResutList
(
@Param
(
"templateId"
)
String
templateId
);
// 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
List
<
String
>
getSignNameList
(
@Param
(
"signName"
)
String
signName
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TFascTemplateService.java
View file @
5de2de7d
...
@@ -17,13 +17,14 @@
...
@@ -17,13 +17,14 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TFascTemplateSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
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.archives.vo.TFascTemplateSearchVo
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.List
;
import
java.util.List
;
...
@@ -35,6 +36,10 @@ import java.util.List;
...
@@ -35,6 +36,10 @@ import java.util.List;
* @date 2025-09-30 16:29:28
* @date 2025-09-30 16:29:28
*/
*/
public
interface
TFascTemplateService
extends
IService
<
TFascTemplate
>
{
public
interface
TFascTemplateService
extends
IService
<
TFascTemplate
>
{
// 获取签署方的下拉框,模糊搜索,去重,皖信放第一位
List
<
String
>
getSignNameList
(
String
signName
);
/**
/**
* 法大大专业版模板表简单分页查询
* 法大大专业版模板表简单分页查询
* @param tFascTemplate 法大大专业版模板表
* @param tFascTemplate 法大大专业版模板表
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TFascTemplateServiceImpl.java
View file @
5de2de7d
...
@@ -74,6 +74,11 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
...
@@ -74,6 +74,11 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
private
final
TFascTemplateDetailMapper
tFascTemplateDetailMapper
;
private
final
TFascTemplateDetailMapper
tFascTemplateDetailMapper
;
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
private
final
TFascTemplateDetailService
tFascTemplateDetailService
;
@Override
public
List
<
String
>
getSignNameList
(
String
signName
)
{
return
baseMapper
.
getSignNameList
(
signName
);
}
/**
/**
* 法大大专业版模板表简单分页查询
* 法大大专业版模板表简单分页查询
*
*
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateMapper.xml
View file @
5de2de7d
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
AND a.company_name like concat('%', #{tFascTemplate.companyName}, '%')
AND a.company_name like concat('%', #{tFascTemplate.companyName}, '%')
</if>
</if>
<if
test=
"tFascTemplate.signName != null and tFascTemplate.signName.trim() != ''"
>
<if
test=
"tFascTemplate.signName != null and tFascTemplate.signName.trim() != ''"
>
AND a.sign_name
like concat('%', #{tFascTemplate.signName}, '%')
AND a.sign_name
= #{tFascTemplate.signName}
</if>
</if>
<if
test=
"tFascTemplate.signOpenId != null and tFascTemplate.signOpenId.trim() != ''"
>
<if
test=
"tFascTemplate.signOpenId != null and tFascTemplate.signOpenId.trim() != ''"
>
AND a.sign_open_id = #{tFascTemplate.signOpenId}
AND a.sign_open_id = #{tFascTemplate.signOpenId}
...
@@ -267,4 +267,17 @@
...
@@ -267,4 +267,17 @@
</if>
</if>
</select>
</select>
<!--获取签署方下拉列表-->
<select
id=
"getSignNameList"
resultType=
"java.lang.String"
>
SELECT
DISTINCT a.sign_name
FROM t_fasc_template a
where a.delete_flag = '0'
<if
test=
"signName != null and signName.trim() != ''"
>
AND a.sign_name like concat('%', #{signName}, '%')
</if>
ORDER BY CASE WHEN a.sign_name = '安徽皖信人力资源管理有限公司' THEN 0 ELSE 1 END
,a.fasc_create_time ASC
</select>
</mapper>
</mapper>
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSpecialDeducationSum.java
View file @
5de2de7d
...
@@ -268,4 +268,17 @@ public class TSpecialDeducationSum extends BaseEntity {
...
@@ -268,4 +268,17 @@ public class TSpecialDeducationSum extends BaseEntity {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"备注"
)
@ExcelProperty
(
value
=
"备注"
)
private
String
remark
;
private
String
remark
;
@ExcelAttribute
(
name
=
"公务交通费用"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"公务交通费用"
)
private
BigDecimal
gongWuMoney
;
@ExcelAttribute
(
name
=
"通讯费用"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"通讯费用"
)
private
BigDecimal
tongXunMoney
;
@ExcelAttribute
(
name
=
"律师办案费"
,
isFloat
=
true
,
max
=
"999999999.99"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"律师办案费"
)
private
BigDecimal
lvShiMoney
;
}
}
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSpecialDeducationSumMapper.xml
View file @
5de2de7d
...
@@ -39,6 +39,9 @@
...
@@ -39,6 +39,9 @@
<result
property=
"costReduction"
column=
"COST_REDUCTION"
/>
<result
property=
"costReduction"
column=
"COST_REDUCTION"
/>
<result
property=
"taxesWithheld"
column=
"TAXES_WITHHELD"
/>
<result
property=
"taxesWithheld"
column=
"TAXES_WITHHELD"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"gongWuMoney"
column=
"GONG_WU_MONEY"
/>
<result
property=
"tongXunMoney"
column=
"TONG_XUN_MONEY"
/>
<result
property=
"lvShiMoney"
column=
"LV_SHI_MONEY"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -76,6 +79,9 @@
...
@@ -76,6 +79,9 @@
COST_REDUCTION,
COST_REDUCTION,
TAXES_WITHHELD,
TAXES_WITHHELD,
REMARK
REMARK
,GONG_WU_MONEY
,TONG_XUN_MONEY
,LV_SHI_MONEY
</sql>
</sql>
<sql
id=
"tSpecialDeducationSum_where"
>
<sql
id=
"tSpecialDeducationSum_where"
>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SociaFriendYgsAddVo.java
View file @
5de2de7d
...
@@ -236,4 +236,7 @@ public class SociaFriendYgsAddVo implements Serializable {
...
@@ -236,4 +236,7 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty
(
"医保推送类型"
)
@ExcelProperty
(
"医保推送类型"
)
private
String
isSingleYsdPush
;
private
String
isSingleYsdPush
;
// 减员年月,取派单审核月的最后一天
private
String
auditLastDay
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
5de2de7d
...
@@ -8,23 +8,25 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...
@@ -8,23 +8,25 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException
;
import
com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException
;
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.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendBackLog
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendBackLog
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendBackLogService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendBackLogService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.FeedBackUrlVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.FriendResult
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierBackVo
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.*
;
import
org.springframework.http.*
;
import
org.springframework.security.core.parameters.P
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.client.RestTemplate
;
import
org.springframework.web.util.UriComponentsBuilder
;
import
java.net.URL
;
import
java.security.SignatureException
;
import
java.security.SignatureException
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeParseException
;
import
java.util.*
;
import
java.util.*
;
import
static
com
.
alibaba
.
fastjson
.
serializer
.
SerializerFeature
.*;
import
static
com
.
alibaba
.
fastjson
.
serializer
.
SerializerFeature
.*;
...
@@ -460,6 +462,9 @@ public class SocialFriendConfig {
...
@@ -460,6 +462,9 @@ public class SocialFriendConfig {
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组
// 企业职工基本医疗保险参保登记表 安徽非必填! 数组
String
[]
arr
=
{
qyzgjbylbxcbdjb
};
String
[]
arr
=
{
qyzgjbylbxcbdjb
};
JSONArray
ybzyclArr
;
JSONArray
ybzyclArr
;
String
birthStr
;
String
thisDay
=
DateUtil
.
formatDate
(
new
Date
());
String
workDay
;
// 2025-3-14 15:44:32 单个改造为批量
// 2025-3-14 15:44:32 单个改造为批量
for
(
SociaFriendYgsAddVo
vo
:
listVo
)
{
for
(
SociaFriendYgsAddVo
vo
:
listVo
)
{
cbrymdOne
=
new
JSONObject
();
cbrymdOne
=
new
JSONObject
();
...
@@ -475,7 +480,8 @@ public class SocialFriendConfig {
...
@@ -475,7 +480,8 @@ public class SocialFriendConfig {
// 性别
// 性别
cbrymdOne
.
put
(
"xb"
,
getSexName
(
vo
.
getEmpIdcard
()));
cbrymdOne
.
put
(
"xb"
,
getSexName
(
vo
.
getEmpIdcard
()));
// 出生日期
// 出生日期
cbrymdOne
.
put
(
"csrq"
,
getBirthStr
(
vo
.
getEmpIdcard
()));
birthStr
=
getBirthStr
(
vo
.
getEmpIdcard
());
cbrymdOne
.
put
(
"csrq"
,
birthStr
);
// 民族 空的默认汉族
// 民族 空的默认汉族
cbrymdOne
.
put
(
"mz"
,
vo
.
getEmpNational
());
cbrymdOne
.
put
(
"mz"
,
vo
.
getEmpNational
());
// 手机号码
// 手机号码
...
@@ -493,8 +499,11 @@ public class SocialFriendConfig {
...
@@ -493,8 +499,11 @@ public class SocialFriendConfig {
cbrymdOne
.
put
(
"jzdzxzq"
,
areaName
);
cbrymdOne
.
put
(
"jzdzxzq"
,
areaName
);
// 社保起缴日期(养老起缴)yyyy-MM-dd
// 社保起缴日期(养老起缴)yyyy-MM-dd
startDate
=
vo
.
getSocialStartDate
();
startDate
=
vo
.
getSocialStartDate
();
// workDay = startDate,判断要在区间birthStr和thisDay之间,否则为birthStr或thisDay
workDay
=
startDate
;
workDay
=
judgeWorkDayBetweenBirthAndThisDay
(
birthStr
,
thisDay
,
workDay
);
// 参加工作日期
// 参加工作日期
cbrymdOne
.
put
(
"cjgzrq"
,
startDate
);
cbrymdOne
.
put
(
"cjgzrq"
,
workDay
);
// 文化程度 见字典“受教育程度” 空的默认“大学专科”
// 文化程度 见字典“受教育程度” 空的默认“大学专科”
//cbrymdOne.put("whcd", "大学专科")
//cbrymdOne.put("whcd", "大学专科")
cbrymdOne
.
put
(
"whcd"
,
vo
.
getEducationName
());
cbrymdOne
.
put
(
"whcd"
,
vo
.
getEducationName
());
...
@@ -625,6 +634,37 @@ public class SocialFriendConfig {
...
@@ -625,6 +634,37 @@ public class SocialFriendConfig {
json
.
put
(
buyType
,
cbrymdArr
);
json
.
put
(
buyType
,
cbrymdArr
);
}
}
// 判断参加工作日期在出生日期与当前时间之间
private
static
String
judgeWorkDayBetweenBirthAndThisDay
(
String
birthStr
,
String
thisDay
,
String
workDay
)
{
if
(
Common
.
isNotNull
(
workDay
)
&&
Common
.
isNotNull
(
birthStr
)
&&
Common
.
isNotNull
(
thisDay
))
{
// 确保参加工作日期在出生日期之后,今天之前
if
(
isValidDate
(
birthStr
)
&&
workDay
.
compareTo
(
birthStr
)
<
0
)
{
// 如果参加工作日期早于出生日期,使用出生日期
workDay
=
birthStr
;
}
else
if
(
workDay
.
compareTo
(
thisDay
)
>
0
)
{
// 如果参加工作日期晚于今天,使用今天
workDay
=
thisDay
;
}
}
else
{
// 如果 startDate 为空,默认为今天
workDay
=
thisDay
;
}
return
workDay
;
}
// 判断字符串是否为日期格式
public
static
boolean
isValidDate
(
String
birthStr
)
{
if
(
birthStr
==
null
||
birthStr
.
trim
().
isEmpty
())
{
return
false
;
}
try
{
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
);
LocalDate
.
parse
(
birthStr
,
formatter
);
return
true
;
}
catch
(
DateTimeParseException
e
)
{
return
false
;
}
}
/**
/**
* @param json 主json存数据
* @param json 主json存数据
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendMapper.xml
View file @
5de2de7d
...
@@ -111,6 +111,7 @@
...
@@ -111,6 +111,7 @@
,idt.AREA_NAME idCardTown
,idt.AREA_NAME idCardTown
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay
</sql>
</sql>
...
@@ -356,6 +357,7 @@
...
@@ -356,6 +357,7 @@
,s.SOCIAL_HOUSEHOLD huId
,s.SOCIAL_HOUSEHOLD huId
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay
<include
refid=
"getSocialSoldierBaseTwo"
/>
<include
refid=
"getSocialSoldierBaseTwo"
/>
<if
test=
"idsStr != null and idsStr.size > 0"
>
<if
test=
"idsStr != null and idsStr.size > 0"
>
/*派单推的,有ID,则查单个推送的,立即推*/
/*派单推的,有ID,则查单个推送的,立即推*/
...
...
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