Commit a1d3f6dd authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

parents be2ce15b 045d598e
...@@ -93,9 +93,9 @@ public class TEmployeeRetirementExportVo{ ...@@ -93,9 +93,9 @@ public class TEmployeeRetirementExportVo{
private String fileAddress; private String fileAddress;
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保所在地") @ExcelProperty("社保缴纳地")
@ExcelAttribute(name = "社保所在地") @ExcelAttribute(name = "社保缴纳地")
@Schema(description = "社保所在地") @Schema(description = "社保缴纳地")
private String socialAddress; private String socialAddress;
......
...@@ -48,7 +48,7 @@ public class TEmployeeRetirementController { ...@@ -48,7 +48,7 @@ public class TEmployeeRetirementController {
@Inner @Inner
@Operation(summary = "分页查询", description = "分页查询") @Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/inner/retireeRemind" ) @PostMapping("/inner/retireeRemind" )
public void retireeRemind() { public void retireeRemind() {
tEmployeeRetirementService.retireeRemind(); tEmployeeRetirementService.retireeRemind();
} }
......
...@@ -25,13 +25,13 @@ public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetiremen ...@@ -25,13 +25,13 @@ public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetiremen
IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, @Param("searchVo") TEmployeeRetirementSearchVo searchVo); IPage<TEmployeeRetirement> getTEmployeeRetirementPage(Page page, @Param("searchVo") TEmployeeRetirementSearchVo searchVo);
List<TEmployeeRetirement> getBirthday(@Param("TT") String TT, @Param("LL") String LL); List<TEmployeeRetirement> getBirthday(@Param("oo") String oo, @Param("pp") String pp);
boolean changeHandleFlagAll(@Param("changeHandleFlagAllVo") ChangeHandleFlagAllVo changeHandleFlagAllVo); boolean changeHandleFlagAll(@Param("changeHandleFlagAllVo") ChangeHandleFlagAllVo changeHandleFlagAllVo);
boolean changeHandleFlag(@Param("changeHandleFlagVo")ChangeHandleFlagVo changeHandleFlagVo); boolean changeHandleFlag(@Param("changeHandleFlagVo")ChangeHandleFlagVo changeHandleFlagVo);
int selectByEmpIdcard(@Param("empIdCard") String empIdCard); int selectByEmpIdcard(@Param("empIdCard") String empIdCard,@Param("deptNo") String deptNo);
int add(@Param("tEmployeeRetirement") TEmployeeRetirement tEmployeeRetirement); int add(@Param("tEmployeeRetirement") TEmployeeRetirement tEmployeeRetirement);
......
...@@ -1245,7 +1245,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1245,7 +1245,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TSocialFundInfo sf = new TSocialFundInfo(); TSocialFundInfo sf = new TSocialFundInfo();
sf.setEmpIdcard(insert.getEmpIdcard()); sf.setEmpIdcard(insert.getEmpIdcard());
sf.setSettleDomain(insert.getSettleDomain()); sf.setSettleDomain(insert.getSettleDomain());
if (!CommonConstants.ONE_STRING.equals(insert.getSituation()) && !CommonConstants.TWO_STRING.equals(insert.getSituation()) && !CommonConstants.THREE_STRING.equals(insert.getSituation()) &&!CommonConstants.FOUR_STRING.equals(insert.getSituation())) { if (!("合同未到期重新签订").equals(insert.getSituation())&&!("正常续签").equals(insert.getSituation())
&&!("离职再入职").equals(insert.getSituation()) &&!("商务合同更改").equals(insert.getSituation())) {
R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId() R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN); , "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN);
if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) { if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) {
...@@ -1254,7 +1255,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1254,7 +1255,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} }
} }
}
}
} }
/** /**
......
...@@ -55,7 +55,6 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper; ...@@ -55,7 +55,6 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
@Override @Override
@Scheduled(cron = "0 */1 * * * ?")
public void retireeRemind() { public void retireeRemind() {
Date date = DateUtil.getCurrentDateTime(); Date date = DateUtil.getCurrentDateTime();
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
...@@ -67,9 +66,11 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper; ...@@ -67,9 +66,11 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
String wRemainTime = DateUtil.getYearAndMonth(YearMonth, ArchivesConstants.WYEAR_MONTH); String wRemainTime = DateUtil.getYearAndMonth(YearMonth, ArchivesConstants.WYEAR_MONTH);
String TT = mRemainTime + dateOne; String TT = mRemainTime + dateOne;
String LL = wRemainTime + dateOne; String LL = wRemainTime + dateOne;
List<TEmployeeRetirement> list = baseMapper.getBirthday(DateUtil.dateToString(DateUtil.stringToDate(TT),DateUtil.ISO_EXPANDED_DATE_FORMAT),DateUtil.dateToString(DateUtil.stringToDate(LL),DateUtil.ISO_EXPANDED_DATE_FORMAT)); String oo=DateUtil.dateToString(DateUtil.stringToDate(TT));
String pp=DateUtil.dateToString(DateUtil.stringToDate(LL));
List<TEmployeeRetirement> list = baseMapper.getBirthday(oo,pp);
for (TEmployeeRetirement tEmployeeRetirement : list) { for (TEmployeeRetirement tEmployeeRetirement : list) {
int i = baseMapper.selectByEmpIdcard(tEmployeeRetirement.getEmpIdcard()); int i = baseMapper.selectByEmpIdcard(tEmployeeRetirement.getEmpIdcard(),tEmployeeRetirement.getDeptNo());
if (i == 0) { if (i == 0) {
tEmployeeRetirement.setHandleFlag(0); tEmployeeRetirement.setHandleFlag(0);
tEmployeeRetirement.setCreateBy("1"); tEmployeeRetirement.setCreateBy("1");
......
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
<if test="searchVo.unitName!= null"> <if test="searchVo.unitName!= null">
AND a.UNIT_NAME = #{searchVo.unitName} AND a.UNIT_NAME = #{searchVo.unitName}
</if> </if>
<if test="searchVo.unitNo!= null"> <if test="searchVo.unitNo!= null and searchVo.unitNo!=''" >
AND a.UNIT_NO = #{searchVo.unitNo} AND a.UNIT_NO = #{searchVo.unitNo}
</if> </if>
<if test="searchVo.deptName!= null"> <if test="searchVo.deptName!= null">
AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%') AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
</if> </if>
<if test="searchVo.deptNo!= null"> <if test="searchVo.deptNo!= null and searchVo.deptNo!=''">
AND a.DEPT_NO =#{searchVo.deptNo} AND a.DEPT_NO =#{searchVo.deptNo}
</if> </if>
<if test="searchVo.handleFlag!= null"> <if test="searchVo.handleFlag!= null">
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<sql id="tEmployeeRetirement_where"> <sql id="tEmployeeRetirement_where">
<if test="searchVo.empName != null and searchVo.empName.trim() != ''"> <if test="searchVo.empName != null and searchVo.empName.trim() != ''">
AND a.EMP_NAME like concat('%',#{searchVo.empName},'%') AND a.EMP_NAME like concat('%',#{searchVo.empName},'%')
</if> </if>
...@@ -133,7 +134,7 @@ ...@@ -133,7 +134,7 @@
AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%') AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
</if> </if>
<if test="searchVo.deptNo!= null"> <if test="searchVo.deptNo!= null">
AND a.DEPART_NO =#{searchVo.deptNo} AND a.DEPT_NO =#{searchVo.deptNo}
</if> </if>
<if test="searchVo.handleFlag!= null"> <if test="searchVo.handleFlag!= null">
AND a.HANDLE_FLAG =#{searchVo.handleFlag} AND a.HANDLE_FLAG =#{searchVo.handleFlag}
...@@ -156,9 +157,9 @@ ...@@ -156,9 +157,9 @@
</select> </select>
<select id="selectByEmpIdcard" resultType="Integer"> <select id="selectByEmpIdcard" resultType="Integer">
SELECT count(*) SELECT count(*)
<include refid="Base_Column_List"/>
FROM t_employee_retirement a FROM t_employee_retirement a
where EMP_IDCARD=#{empIdCard} where EMP_IDCARD=#{empIdCard}
and DEPT_NO=#{deptNo}
</select> </select>
<select id="getBirthday" parameterType="String" resultMap="BaseResultMap"> <select id="getBirthday" parameterType="String" resultMap="BaseResultMap">
SELECT a.EMP_NAME, SELECT a.EMP_NAME,
...@@ -184,10 +185,12 @@ ...@@ -184,10 +185,12 @@
b.EMP_BIRTHDAY b.EMP_BIRTHDAY
FROM t_employee_project a FROM t_employee_project a
LEFT JOIN t_employee_info b ON a.EMP_IDCARD = b.EMP_IDCARD LEFT JOIN t_employee_info b ON a.EMP_IDCARD = b.EMP_IDCARD
where ((datediff(#{TT}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1') where ((datediff(#{oo}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
or (datediff(#{LL}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2')) or (datediff(#{pp}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3') and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3')
GROUP BY a.EMP_ID and a.PROJECT_STATUS = 0
GROUP BY a.EMP_IDCARD,
a.DEPT_NO
</select> </select>
<update id="changeHandleFlagAll" parameterType="com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeHandleFlagAllVo"> <update id="changeHandleFlagAll" parameterType="com.yifu.cloud.plus.v1.yifu.archives.vo.ChangeHandleFlagAllVo">
......
...@@ -9,7 +9,6 @@ spring: ...@@ -9,7 +9,6 @@ spring:
matching-strategy: ant_path_matcher matching-strategy: ant_path_matcher
redis: redis:
host: 127.0.0.1 host: 127.0.0.1
password: '@yf_2017'
cloud: cloud:
sentinel: sentinel:
eager: true eager: true
......
...@@ -56,7 +56,7 @@ public class ArchiveTask { ...@@ -56,7 +56,7 @@ public class ArchiveTask {
public void retireeRemind() { public void retireeRemind() {
log.info("-------------每日凌晨1点人员退休提醒-定时任务开始------------"); log.info("-------------每日凌晨1点人员退休提醒-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(), HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(), daprArchivesProperties.getAppId(),
"/temployeeretirement/inner/everyDayRemind", "", Object.class, "/temployeeretirement/inner/retireeRemind", "", Object.class,
SecurityConstants.FROM_IN); SecurityConstants.FROM_IN);
log.info("-------------每日凌晨1点人员退休提醒-定时任务开始------------"); log.info("-------------每日凌晨1点人员退休提醒-定时任务开始------------");
} }
......
...@@ -1051,7 +1051,7 @@ ...@@ -1051,7 +1051,7 @@
s.PERSONAL_BIGAILMENT_MONEY, s.PERSONAL_BIGAILMENT_MONEY,
a.TRUST_REMARK, a.TRUST_REMARK,
a.REDUCE_REASON, a.REDUCE_REASON,
a.EXPORT_SOCIAL_FLAG '1' as EXPORT_SOCIAL_FLAG
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
<include refid="where_getSocialRecordRoster"/> <include refid="where_getSocialRecordRoster"/>
...@@ -1173,7 +1173,7 @@ ...@@ -1173,7 +1173,7 @@
a.TRUST_REMARK, a.TRUST_REMARK,
a.LEAVE_DATE, a.LEAVE_DATE,
a.REDUCE_REASON, a.REDUCE_REASON,
a.EXPORT_FUND_FLAG '1' as EXPORT_FUND_FLAG
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_provident_fund f on a.FUND_ID = f.id left join t_provident_fund f on a.FUND_ID = f.id
<where> <where>
...@@ -1245,7 +1245,7 @@ ...@@ -1245,7 +1245,7 @@
</if> </if>
</if> </if>
</if>--> </if>-->
<if test="tDispatchInfo.empTypeList != null "> <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=")">
#{item} #{item}
...@@ -1345,7 +1345,7 @@ ...@@ -1345,7 +1345,7 @@
AND a.STATUS = "2" AND a.STATUS = "2"
and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1'))
and a.SOCIAL_HANDLE_STATUS in ('0','4') and a.SOCIAL_HANDLE_STATUS in ('0','4')
<if test="tDispatchInfo.empTypeList != null "> <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=")">
#{item} #{item}
...@@ -1481,7 +1481,7 @@ ...@@ -1481,7 +1481,7 @@
INSTR(a.DISPATCH_ITEM,#{item}) INSTR(a.DISPATCH_ITEM,#{item})
</foreach> </foreach>
</if> </if>
<if test="tDispatchInfo.empTypeList != null "> <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=")">
#{item} #{item}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment