Commit 489d2e5a authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent b343ec60
...@@ -227,23 +227,27 @@ public class TSocialFundInfoController { ...@@ -227,23 +227,27 @@ public class TSocialFundInfoController {
/** /**
* 通过身份证查询在途或在保的数据 * 通过身份证查询在途或在保的数据
* @param empIdcard 社保公积金查询表 * @param empIdcard 社保公积金查询表
* @param type 0 确认接收使用,1信息修改使用
* @return * @return
*/ */
@Operation(summary = "通过身份证查询在途或在保的数据", description = "通过身份证查询在途或在保的数据") @Operation(summary = "通过身份证查询在途或在保的数据", description = "通过身份证查询在途或在保的数据")
@PostMapping("/selectUnSocialFundInfoByEmpIdcard" ) @PostMapping("/selectUnSocialFundInfoByEmpIdcard" )
public R<List<UnSocialFundInfoVo>> selectUnSocialFundInfoByEmpIdcard(@RequestParam String empIdcard) { public R<List<UnSocialFundInfoVo>> selectUnSocialFundInfoByEmpIdcard(@RequestParam String empIdcard,
return R.ok(tSocialFundInfoService.selectUnSocialFundInfoByEmpIdcard(empIdcard)); @RequestParam(required = false) String type) {
return R.ok(tSocialFundInfoService.selectUnSocialFundInfoByEmpIdcard(empIdcard, type));
} }
/** /**
* 通过身份证查询在途或在保的公积金数据 * 通过身份证查询在途或在保的公积金数据
* @param empIdcard 社保公积金查询表 * @param empIdcard 社保公积金查询表
* @param type 0 确认接收使用,1信息修改使用
* @return * @return
*/ */
@Operation(summary = "通过身份证查询在途或在保的公积金数据", description = "通过身份证查询在途或在保的公积金数据") @Operation(summary = "通过身份证查询在途或在保的公积金数据", description = "通过身份证查询在途或在保的公积金数据")
@PostMapping("/selectUnFundInfoByEmpIdcard" ) @PostMapping("/selectUnFundInfoByEmpIdcard" )
public R<List<UnFundInfoVo>> selectUnFundInfoByEmpIdcard(@RequestParam String empIdcard) { public R<List<UnFundInfoVo>> selectUnFundInfoByEmpIdcard(@RequestParam String empIdcard,
return R.ok(tSocialFundInfoService.selectUnFundInfoByEmpIdcard(empIdcard)); @RequestParam(required = false) String type) {
return R.ok(tSocialFundInfoService.selectUnFundInfoByEmpIdcard(empIdcard, type));
} }
......
...@@ -98,13 +98,13 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> { ...@@ -98,13 +98,13 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
**/ **/
List<String> getSocialWorkInjuryList(); List<String> getSocialWorkInjuryList();
List<UnSocialFundInfoVo> selectUnSocialFundInfoByEmpIdcard(@Param("empIdcard") String empIdcard); List<UnSocialFundInfoVo> selectUnSocialFundInfoByEmpIdcard(@Param("empIdcard") String empIdcard,@Param("type") String type);
long selectSocialFundInfoCountByEmpIdcard(@Param("empIdcard") String empIdcard); long selectSocialFundInfoCountByEmpIdcard(@Param("empIdcard") String empIdcard);
long selectFundCountByEmpIdcard(@Param("empIdcard") String empIdcard); long selectFundCountByEmpIdcard(@Param("empIdcard") String empIdcard);
List<UnFundInfoVo> selectUnFundInfoByEmpIdcard(@Param("empIdcard")String empIdcard); List<UnFundInfoVo> selectUnFundInfoByEmpIdcard(@Param("empIdcard")String empIdcard,@Param("type") String type);
// 离职待办专用,查询社保ID与状态(主要派增部分失败与成功的) // 离职待办专用,查询社保ID与状态(主要派增部分失败与成功的)
TSocialFundInfo getSocialStatus(@Param("empIdCard") String empIdCard, @Param("deptNo") String deptNo); TSocialFundInfo getSocialStatus(@Param("empIdCard") String empIdCard, @Param("deptNo") String deptNo);
......
...@@ -96,7 +96,7 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> { ...@@ -96,7 +96,7 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
SocialFundVo getSocialAndFundReduceListByEmpIdCardSet(Set<String> empIdCardSet); SocialFundVo getSocialAndFundReduceListByEmpIdCardSet(Set<String> empIdCardSet);
List<UnSocialFundInfoVo> selectUnSocialFundInfoByEmpIdcard(String empIdcard); List<UnSocialFundInfoVo> selectUnSocialFundInfoByEmpIdcard(String empIdcard,String type);
Boolean selectExitEmpSocail(TEmployeeAutoRegistCheckVo cardVo); Boolean selectExitEmpSocail(TEmployeeAutoRegistCheckVo cardVo);
...@@ -109,7 +109,7 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> { ...@@ -109,7 +109,7 @@ public interface TSocialFundInfoService extends IService<TSocialFundInfo> {
**/ **/
Boolean selectExitEmpFund(TEmployeeAutoRegistCheckVo cardVo); Boolean selectExitEmpFund(TEmployeeAutoRegistCheckVo cardVo);
List<UnFundInfoVo> selectUnFundInfoByEmpIdcard(String empIdcard); List<UnFundInfoVo> selectUnFundInfoByEmpIdcard(String empIdcard,String type);
/** /**
* @param paramVo * @param paramVo
......
...@@ -954,12 +954,12 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe ...@@ -954,12 +954,12 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
} }
@Override @Override
public List<UnSocialFundInfoVo> selectUnSocialFundInfoByEmpIdcard(String empIdcard) { public List<UnSocialFundInfoVo> selectUnSocialFundInfoByEmpIdcard(String empIdcard,String type) {
return baseMapper.selectUnSocialFundInfoByEmpIdcard(empIdcard); return baseMapper.selectUnSocialFundInfoByEmpIdcard(empIdcard, type);
} }
@Override @Override
public List<UnFundInfoVo> selectUnFundInfoByEmpIdcard(String empIdcard) { public List<UnFundInfoVo> selectUnFundInfoByEmpIdcard(String empIdcard,String type) {
return baseMapper.selectUnFundInfoByEmpIdcard(empIdcard); return baseMapper.selectUnFundInfoByEmpIdcard(empIdcard, type);
} }
@Override @Override
public Boolean selectExitEmpSocail(TEmployeeAutoRegistCheckVo cardVo) { public Boolean selectExitEmpSocail(TEmployeeAutoRegistCheckVo cardVo) {
......
...@@ -1251,7 +1251,9 @@ ...@@ -1251,7 +1251,9 @@
where a.EMP_IDCARD = #{empIdcard} where a.EMP_IDCARD = #{empIdcard}
<!-- 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败) --> <!-- 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败) -->
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12') and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
and a.create_name not like '自动化%' <if test="type != null and type = '1'">
and a.create_name not like '自动化%'
</if>
</select> </select>
<!--tSocialFundInfo简单分页查询--> <!--tSocialFundInfo简单分页查询-->
<select id="selectUnFundInfoByEmpIdcard" resultMap="unFundInfoMap"> <select id="selectUnFundInfoByEmpIdcard" resultMap="unFundInfoMap">
...@@ -1275,7 +1277,9 @@ ...@@ -1275,7 +1277,9 @@
<!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) --> <!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) -->
and a.fund_status in ('0', '1', '3', '5', '6', '8') and a.fund_status in ('0', '1', '3', '5', '6', '8')
and a.create_name not like '自动化%' <if test="type != null and type == '1'">
and a.create_name not like '自动化%'
</if>
</select> </select>
<select id="selectSocialFundInfoCountByEmpIdcard" resultType="java.lang.Long"> <select id="selectSocialFundInfoCountByEmpIdcard" resultType="java.lang.Long">
SELECT count(1) SELECT count(1)
......
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