Commit e4e46564 authored by hongguangwu's avatar hongguangwu

MVP1.7.10-新菜单:自动化办理查询-导出

parent c37daf4d
...@@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -22,7 +22,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
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.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -49,4 +51,12 @@ public interface TAuditInfoService extends IService<TAuditInfo> { ...@@ -49,4 +51,12 @@ public interface TAuditInfoService extends IService<TAuditInfo> {
List<TAuditInfo> noPageDiy(TAuditInfoSearchVo searchVo); List<TAuditInfo> noPageDiy(TAuditInfoSearchVo searchVo);
/**
* @Description: 加审核日志
* @Author: hgw
* @Date: 2025/4/27 10:49
* @return: void
**/
void doSaveAuditInfo(TSocialInfo social, String title, String handleRemark, String remark, YifuUser user, String auditStatus);
} }
...@@ -32,7 +32,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -32,7 +32,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService;
import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo;
...@@ -46,6 +48,7 @@ import java.io.IOException; ...@@ -46,6 +48,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -244,4 +247,28 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI ...@@ -244,4 +247,28 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
this.save(insert); this.save(insert);
} }
/**
* @Description: 加审核日志
* @Author: hgw
* @Date: 2025/4/27 10:49
* @return: void
**/
@Override
public void doSaveAuditInfo(TSocialInfo social, String title, String handleRemark, String remark, YifuUser user, String auditStatus) {
TAuditInfo auditInfo = new TAuditInfo();
auditInfo.setType(CommonConstants.ONE_STRING);
auditInfo.setId(null);
auditInfo.setAuditStatus(auditStatus);
auditInfo.setAuditRemark(handleRemark);
auditInfo.setTitle(title);
auditInfo.setOrganName(user.getDeptName());
auditInfo.setAuditUser(user.getNickname());
auditInfo.setAuditTime(new Date());
auditInfo.setRemark(remark);
auditInfo.setIsCommision(CommonConstants.ONE_STRING);
auditInfo.setDispatchInfoId(social.getDispatchId());
auditInfo.setEmpIdcard(social.getEmpIdcard());
auditInfo.setSocialId(social.getId());
this.save(auditInfo);
}
} }
...@@ -34,15 +34,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -34,15 +34,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
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.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
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.TDispatchInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierService;
import com.yifu.cloud.plus.v1.yifu.social.vo.SocialAddAndReduceVo; import com.yifu.cloud.plus.v1.yifu.social.vo.SocialAddAndReduceVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoVo;
...@@ -72,7 +71,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -72,7 +71,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
private final SysHouseHoldInfoMapper sysHouseHoldInfoMapper; private final SysHouseHoldInfoMapper sysHouseHoldInfoMapper;
private final TSocialSoldierService tSocialSoldierService; private final TAuditInfoService tAuditInfoService;
/** /**
* 社保明细表简单分页查询 * 社保明细表简单分页查询
...@@ -694,7 +693,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -694,7 +693,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
socialInfo.setDispatchId(disExist.getId()); socialInfo.setDispatchId(disExist.getId());
} }
// 加流程进展明细 // 加流程进展明细
tSocialSoldierService.doSocialTAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user); tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user, CommonConstants.TWO_STRING);
return R.ok("成功"); return R.ok("成功");
} else { } else {
return R.failed("状态未变更,请刷新后查看列表状态!"); return R.failed("状态未变更,请刷新后查看列表状态!");
......
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