Commit 9c02de56 authored by huyuchen's avatar huyuchen

优化修改

parent 7ffc2a20
...@@ -93,4 +93,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> { ...@@ -93,4 +93,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
**/ **/
int everyDayUpdateEmployeContractStatus(); int everyDayUpdateEmployeContractStatus();
int updateSocialAndFundStatusById(@Param("project")TEmployeeProject project);
} }
...@@ -1389,7 +1389,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1389,7 +1389,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (Common.isNotNull(vo.getFundStatus())){ if (Common.isNotNull(vo.getFundStatus())){
project.setFundStatus(Integer.parseInt(vo.getFundStatus())); project.setFundStatus(Integer.parseInt(vo.getFundStatus()));
} }
baseMapper.updateById(project); baseMapper.updateSocialAndFundStatusById(project);
} }
return true; return true;
} }
......
...@@ -874,4 +874,13 @@ ...@@ -874,4 +874,13 @@
where e.CONTRACT_STATUS != 2 and c.CONTRACT_END <![CDATA[ < ]]> DATE_FORMAT(curdate(),"%Y-%m-%d") where e.CONTRACT_STATUS != 2 and c.CONTRACT_END <![CDATA[ < ]]> DATE_FORMAT(curdate(),"%Y-%m-%d")
</update> </update>
<update id="updateSocialAndFundStatusById" >
update t_employee_project a
<trim prefix="set" suffixOverrides=",">
<if test="project.id != null">a.id=a.id,</if>
<if test="project.socialStatus != null">SOCIAL_STATUS=#{project.socialStatus},</if>
<if test="project.fundStatus != null">FUND_STATUS=#{project.fundStatus},</if>
</trim>
WHERE a.id=#{project.id}
</update>
</mapper> </mapper>
...@@ -386,6 +386,7 @@ public class TDispatchInfoController { ...@@ -386,6 +386,7 @@ public class TDispatchInfoController {
* @return * @return
**/ **/
@Operation(description = "派单申请批量审核,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit') auditStatus:1审核通过 2审核不通过") @Operation(description = "派单申请批量审核,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit') auditStatus:1审核通过 2审核不通过")
@SysLog("派单申请批量审核")
@PostMapping("/addApplyAudit") @PostMapping("/addApplyAudit")
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')") //@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
public R<List<ErrorMessage>> addApplyAudit(@RequestBody List<String> idList, public R<List<ErrorMessage>> addApplyAudit(@RequestBody List<String> idList,
...@@ -407,6 +408,7 @@ public class TDispatchInfoController { ...@@ -407,6 +408,7 @@ public class TDispatchInfoController {
* @Date 2019-09-27 * @Date 2019-09-27
**/ **/
@Operation(description = "派单批量办理,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle') handleStatus 1 办理成功 2 办理失败") @Operation(description = "派单批量办理,传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle') handleStatus 1 办理成功 2 办理失败")
@SysLog("派单批量办理")
@PostMapping("/addApplyHandle") @PostMapping("/addApplyHandle")
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')") //@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
public R<List<ErrorMessage>> addApplyHandle(@RequestBody List<String> idList, public R<List<ErrorMessage>> addApplyHandle(@RequestBody List<String> idList,
...@@ -429,21 +431,14 @@ public class TDispatchInfoController { ...@@ -429,21 +431,14 @@ public class TDispatchInfoController {
@SysLog("导出社保花名册信息") @SysLog("导出社保花名册信息")
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportSocialRecordRoster')") //@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportSocialRecordRoster')")
public void doexportSocialRecordRoster(HttpServletResponse response, HttpServletRequest request, public void doexportSocialRecordRoster(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo, @RequestBody SocialHandleSearchVo searchVo) {
@RequestParam(required = true,name = "mId") String mId) {
if (Common.isEmpty(searchVo)){
searchVo = new SocialHandleSearchVo();
}
searchVo.setMId(mId);
searchVo.setDeleteFlag(CommonConstants.ZERO_STRING); searchVo.setDeleteFlag(CommonConstants.ZERO_STRING);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
log.error("userINfo:"+ user.getUserGroup() +"|"+user.getId()+"|"+searchVo.getMId());
menuUtil.setAuthSql(user, searchVo); menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) { if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN")); searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
} }
searchVo.setCreateBy(user.getId()); searchVo.setCreateBy(user.getId());
log.error(searchVo.getAuthSql());
tDispatchInfoService.doexportSocialRecordRoster(response,searchVo,searchVo.getIdStr(),null); tDispatchInfoService.doexportSocialRecordRoster(response,searchVo,searchVo.getIdStr(),null);
} }
...@@ -488,4 +483,5 @@ public class TDispatchInfoController { ...@@ -488,4 +483,5 @@ public class TDispatchInfoController {
String sql = CommonConstants.EMPTY_STRING; String sql = CommonConstants.EMPTY_STRING;
return tDispatchInfoService.getFundSupplementaryRecords(idStr,searchVo,settleDomains,sql); return tDispatchInfoService.getFundSupplementaryRecords(idStr,searchVo,settleDomains,sql);
} }
} }
...@@ -37,4 +37,6 @@ public interface TProvidentFundMapper extends BaseMapper<TProvidentFund> { ...@@ -37,4 +37,6 @@ public interface TProvidentFundMapper extends BaseMapper<TProvidentFund> {
* @return * @return
*/ */
IPage<TProvidentFund> getTProvidentFundPage(Page<TProvidentFund> page, @Param("tProvidentFund") TProvidentFund tProvidentFund); IPage<TProvidentFund> getTProvidentFundPage(Page<TProvidentFund> page, @Param("tProvidentFund") TProvidentFund tProvidentFund);
int updateFundInfoById( @Param("tProvidentFund")TProvidentFund providentFund);
} }
...@@ -3555,7 +3555,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3555,7 +3555,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
providentFund.setHandleTime(now); providentFund.setHandleTime(now);
providentFund.setHandleUser(user.getId()); providentFund.setHandleUser(user.getId());
fundMapper.updateById(providentFund); fundMapper.updateFundInfoById(providentFund);
dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), CommonConstants.SIX_STRING, user, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), remark); initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), CommonConstants.SIX_STRING, user, (DispatchConstants.DISPATCH_FUND_REDUCE_SUCCESS + handleRemark), remark);
......
...@@ -289,4 +289,18 @@ ...@@ -289,4 +289,18 @@
<include refid="tProvidentFund_where"/> <include refid="tProvidentFund_where"/>
</where> </where>
</select> </select>
<update id="updateFundInfoById">
update t_provident_fund
<trim prefix="set" suffixOverrides=",">
<if test="tProvidentFund.handleStatus != null">HANDLE_STATUS=#{tProvidentFund.handleStatus},</if>
<if test="tProvidentFund.reduceHandleTime != null">REDUCE_HANDLE_TIME=#{tProvidentFund.reduceHandleTime},</if>
<if test="tProvidentFund.reduceHandleUser != null">REDUCE_HANDLE_USER=#{tProvidentFund.reduceHandleUser},</if>
<if test="tProvidentFund.fundReduceDate != null">FUND_REDUCE_DATE=#{tProvidentFund.fundReduceDate},</if>
<if test="tProvidentFund.reduceCan != null">REDUCE_CAN=#{tProvidentFund.reduceCan},</if>
<if test="tProvidentFund.handleTime != null">HANDLE_TIME=#{tProvidentFund.handleTime},</if>
<if test="tProvidentFund.handleUser != null">HANDLE_USER=#{tProvidentFund.handleUser},</if>
</trim>
WHERE id=#{tProvidentFund.id}
</update>
</mapper> </mapper>
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