Commit 63075361 authored by fangxinjiang's avatar fangxinjiang

Merge branch 'develop'

# Conflicts:
#	yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
parents dc6e5dfe 710dbe24
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/**
* @Author fxj
* @Description 用户表格导入导出默认表头数据
* @Date 9:59 2022/9/20
* @Param
* @return
**/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("l_excel_head_for_io")
@Schema(description = "用户表格导入导出默认表头数据")
public class LExcelHeadForIo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**
* 配置名称
*/
@NotBlank(message = "配置名称不能为空")
@Length(max = 50, message = "配置名称不能超过20个字符")
@ExcelAttribute(name = "配置名称", isNotEmpty = true, errorInfo = "配置名称不能为空", maxLength = 20)
@Schema(description = "配置名称")
private String name;
/**
* 使用者
*/
@Length(max = 32, message = "使用者不能超过32个字符")
@ExcelAttribute(name = "使用者", isNotEmpty = true, errorInfo = "使用者不能为空", maxLength = 32)
@Schema(description = "使用者")
private String createUser;
/**
* 创建时间
*/
@ExcelAttribute(name = "创建时间")
@Schema(description = "创建时间")
private LocalDateTime createTime;
/**
* 使用标识
*/
@NotBlank(message = "使用标识不能为空")
@Length(max = 40, message = "使用标识不能超过40个字符")
@ExcelAttribute(name = "使用标识", isNotEmpty = true, errorInfo = "使用标识不能为空", maxLength = 40)
@Schema(description = "使用标识(建议传按钮的权限标识保证唯一)")
private String useCode;
/**
* 表头内容
*/
@NotBlank(message = "表头内容不能为空")
@ExcelAttribute(name = "表头内容", isNotEmpty = true, errorInfo = "表头内容不能为空")
@Schema(description = "表头内容", name = "excelHeadText")
private String excelHeadText;
/**
* 注释(一般填使用模块方便排查问题)
*/
@Length(max = 50, message = "注释")
@ExcelAttribute(name = "注释", maxLength = 50)
@Schema(description = "注释(一般填使用模块方便排查问题)")
private String remark;
}
......@@ -67,8 +67,14 @@ public class TEmpContractAlert extends BaseEntity {
@Schema(description ="员工ID")
@ExcelProperty("员工ID")
private String empId;
/**
* 项目id
*/
@ExcelAttribute(name = "项目id" )
@Schema(description ="项目id")
@ExcelProperty("项目id")
private String deptId;
/**
* 项目名称
*/
@ExcelAttribute(name = "项目名称" )
......
......@@ -488,4 +488,12 @@ public class TSettleDomain extends BaseEntity {
@ExcelIgnore
private String bpoFlag;
/**
* EKP的服务团队 : 存
*/
@Schema(description = "EKP的服务团队", name = "serviceTeam")
@ExcelIgnore
@TableField(exist = false)
private String serviceTeam;
}
......@@ -38,7 +38,7 @@ public class EmployeeConstants {
public static final String OTHERS = "其他";
public static final String SUB_MUST = "业务细分必填";
public static final String CONTRACT_END_MUST = "合同到期时间必填";
public static final String CONTRACT_TYPE_TWO = "2";
public static final String CONTRACT_TYPE_ONE = "1";
public static final String CONTRACT_NO_IN_USE = "暂无可操作的合同";
public static final String CONTRACT_NAME_EMPTY = "合同类型不能为空";
......
......@@ -7,7 +7,7 @@ public class EmployeeContractConstants {
public static final String NOT_CREATE_USER = "不是创建人,无法删除";
public static final String NOT_AUDIT_STATUS = "不是待提交或审核不通过,无法删除";
public static final String NOT_AUDIT_STATUS = "不是待提交,无法删除";
public static final String NOT_AUDIT = "未审核通过,无法更新";
public static final String INVALID = "作废、终止,无法更新";
......
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.LExcelHeadForIo;
import com.yifu.cloud.plus.v1.yifu.archives.service.LExcelHeadForIoService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.time.LocalDateTime;
import java.util.List;
/**
* @Author fxj
* @Description 用户表格导入导出默认表头数据
* @Date 9:59 2022/9/20
* @Param
* @return
**/
@RestController
@AllArgsConstructor
@RequestMapping("/lexcelheadforio")
@Tag(name = "用户表格导入导出默认表头数据")
public class LExcelHeadForIoController {
private final LExcelHeadForIoService lExcelHeadForIoService;
/**
* 简单分页查询
*
* @param page 分页对象
* @param lExcelHeadForIo 用户表格导入导出默认表头数据
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<LExcelHeadForIo>> getLExcelHeadForIoPage(Page<LExcelHeadForIo> page, LExcelHeadForIo lExcelHeadForIo) {
return new R<>(lExcelHeadForIoService.getLExcelHeadForIoPage(page, lExcelHeadForIo));
}
/**
* 通过id查询单条记录
*
* @param id
* @return R
*/
@Operation(description = "id查询")
@GetMapping("/{id}")
public R<LExcelHeadForIo> getById(@PathVariable("id") String id) {
return new R<>(lExcelHeadForIoService.getById(id));
}
/**
* 通过useCode查询本人配置
*
* @param useCode
* @return R
*/
@Operation(description = "通过useCode查询本人配置")
@GetMapping("/getOwnList/{useCode}")
public R<List<LExcelHeadForIo>> getOwnListByUseCode(@PathVariable("useCode") String useCode) {
YifuUser user = SecurityUtils.getUser();
return new R<>(lExcelHeadForIoService.list(Wrappers.<LExcelHeadForIo>lambdaQuery()
.eq(LExcelHeadForIo::getCreateUser, String.valueOf(user.getId()))
.eq(LExcelHeadForIo::getUseCode, useCode)));
}
/**
* 新增记录
*
* @param lExcelHeadForIo
* @return R
*/
@Operation(description = "新增 maxMun:最大配置项(不传默认3)")
@PostMapping
public R<Boolean> save(@Valid @RequestBody LExcelHeadForIo lExcelHeadForIo,Integer maxMun) {
YifuUser user = SecurityUtils.getUser();
if(null == maxMun){
maxMun = CommonConstants.dingleDigitIntArray[3];
}
lExcelHeadForIo.setCreateUser(String.valueOf(user.getId()));
lExcelHeadForIo.setCreateTime(LocalDateTime.now());
long count = lExcelHeadForIoService.count(Wrappers.<LExcelHeadForIo>lambdaQuery()
.eq(LExcelHeadForIo::getCreateUser, lExcelHeadForIo.getCreateUser())
.eq(LExcelHeadForIo::getUseCode, lExcelHeadForIo.getUseCode()));
if(maxMun <= count){
return R.failed("保存失败,配置项不能超过最大配置数".concat(String.valueOf(maxMun)));
}
return new R<>(lExcelHeadForIoService.save(lExcelHeadForIo));
}
/**
* 修改记录
*
* @param lExcelHeadForIo
* @return R
*/
@Operation(description = "修改(wxhr:lexcelheadforio_edit)")
@SysLog("修改用户表格导入导出默认表头数据")
@PutMapping
public R<Boolean> update(@RequestBody LExcelHeadForIo lExcelHeadForIo) {
if(Common.isEmpty(lExcelHeadForIo.getId())){
return R.failed("操作失败,id不能为空!");
}
LExcelHeadForIo eh = lExcelHeadForIoService.getById(lExcelHeadForIo.getId());
if(null == eh ){
return R.failed("操作失败,无此配置!");
}
YifuUser user = SecurityUtils.getUser();
if(String.valueOf(user.getId()).equals(eh.getCreateUser())){
lExcelHeadForIo.setCreateTime(null);
lExcelHeadForIo.setCreateUser(null);
return new R<>(lExcelHeadForIoService.updateById(lExcelHeadForIo));
}else{
return R.failed("操作失败,此配置不属于您,您无权修改!");
}
}
/**
* 通过id删除一条记录
*
* @param id
* @return R
*/
@Operation(description = "删除(wxhr:lexcelheadforio_del)")
@SysLog("删除用户表格导入导出默认表头数据")
@DeleteMapping("/{id}")
public R<Boolean> removeById(@PathVariable String id) {
LExcelHeadForIo eh = lExcelHeadForIoService.getById(id);
if(null == eh ){
return R.failed("数据库存着此配置,无需重复删除!");
}
YifuUser user = SecurityUtils.getUser();
if(String.valueOf(user.getId()).equals(eh.getCreateUser())){
return new R<>(lExcelHeadForIoService.removeById(id));
}else{
return R.failed("操作失败,此配置不属于您,您无权删除!");
}
}
}
......@@ -66,14 +66,22 @@ public class TCertRecordController {
@GetMapping("/page" )
//@PreAuthorize("@pms.hasPermission('demo_tcertrecord_get')" )
public R<IPage<TCertRecord>> getTCertRecordPage(Page page, CertRecordSearchVo searchVo) {
setAuth(searchVo);
return R.ok(tCertRecordService.pageDiy(page, searchVo));
}
private void setAuth(CertRecordSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
menuUtil.setAuthSql(user, searchVo);
return R.ok(tCertRecordService.pageDiy(page, searchVo));
}
/**
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "dept_id"));
}
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_CREATE_BY)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_CREATE_BY, "CREATE_BY"));
}
}
/**
* 不分页查询
* @param searchVo 证明开具记录表
* @return
......@@ -82,11 +90,7 @@ public class TCertRecordController {
@GetMapping("/noPage" )
//@PreAuthorize("@pms.hasPermission('demo_tcertrecord_get')" )
public R<List<TCertRecord>> getTCertRecordNoPage(CertRecordSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
menuUtil.setAuthSql(user, searchVo);
setAuth(searchVo);
return R.ok(tCertRecordService.getTCertRecordNoPage(searchVo));
}
......
......@@ -22,9 +22,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContractAlertService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ContractAlertSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
......@@ -48,6 +53,7 @@ import java.util.List;
public class TEmpContractAlertController {
private final TEmpContractAlertService tEmpContractAlertService;
private final MenuUtil menuUtil;
/**
* 分页查询
......@@ -59,6 +65,7 @@ public class TEmpContractAlertController {
@GetMapping("/page" )
//@PreAuthorize("@pms.hasPermission('demo_tempcontractalert_get')" )
public R<IPage<TEmpContractAlert>> getTEmpContractAlertPage(Page page, ContractAlertSearchVo searchVo) {
setAuth(searchVo);
return R.ok(tEmpContractAlertService.pageDiy(page, searchVo));
}
/**
......@@ -70,6 +77,7 @@ public class TEmpContractAlertController {
@PostMapping("/noPage" )
//@PreAuthorize("@pms.hasPermission('demo_tempcontractalert_get')" )
public R<List<TEmpContractAlert>> getTEmpContractAlertNoPage(@RequestBody ContractAlertSearchVo searchVo) {
setAuth(searchVo);
return R.ok(tEmpContractAlertService.listDiy(searchVo));
}
......@@ -134,8 +142,23 @@ public class TEmpContractAlertController {
@Operation(description = "导出")
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody ContractAlertSearchVo searchVo) {
setAuth(searchVo);
tEmpContractAlertService.listExport(response,searchVo);
}
private void setAuth(ContractAlertSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "dept_id"));
}
if (searchVo.getAuthSql().contains(CommonConstants.A_CREATE_BY)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_CREATE_BY, "CREATE_BY"));
}
}
}
/**
* 定时任务生成合同续签代码信息
* @return R<List>
......
......@@ -26,8 +26,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
......@@ -53,7 +56,7 @@ import java.util.List;
public class TEmployeeContractInfoController {
private final TEmployeeContractInfoService tEmployeeContractInfoService;
private final MenuUtil menuUtil;
/**
* 申请、归档分页查询
*
......@@ -64,6 +67,7 @@ public class TEmployeeContractInfoController {
@Operation(summary = "申请分页查询(全部的数据(后面加上权限:自己创建的))", description = "申请分页查询")
@GetMapping("/applyPage")
public R<IPage<TEmployeeContractInfo>> getApplyPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
this.setAuth(tEmployeeContractInfo);
return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page, tEmployeeContractInfo));
}
......@@ -72,9 +76,25 @@ public class TEmployeeContractInfoController {
public R<IPage<TEmployeeContractInfo>> getFilingPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
tEmployeeContractInfo.setIsFilePage(CommonConstants.ONE_INT);
tEmployeeContractInfo.setAuditStatus(CommonConstants.dingleDigitIntArray[2]);
this.setAuth(tEmployeeContractInfo);
return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page, tEmployeeContractInfo));
}
/**
* @param tEmployeeContractInfo
* @Description: 加入权限
* @Author: hgw
* @Date: 2022/9/16 16:39
* @return: void
**/
private void setAuth(TEmployeeContractInfo tEmployeeContractInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tEmployeeContractInfo);
if (Common.isNotNull(tEmployeeContractInfo.getAuthSql()) && tEmployeeContractInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tEmployeeContractInfo.setAuthSql(tEmployeeContractInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
}
/**
* 合同审核分页查询
*
......@@ -86,6 +106,7 @@ public class TEmployeeContractInfoController {
@GetMapping("/auditPage")
public R<IPage<TEmployeeContractInfo>> getAuditPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
tEmployeeContractInfo.setAuditStatus(CommonConstants.ONE_INT);
this.setAuth(tEmployeeContractInfo);
return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page, tEmployeeContractInfo));
}
......@@ -99,6 +120,7 @@ public class TEmployeeContractInfoController {
@Operation(summary = "合同查询(全部的数据)", description = "合同查询")
@GetMapping("/page")
public R<IPage<TEmployeeContractInfo>> gettemployeecontractinfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
this.setAuth(tEmployeeContractInfo);
return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page, tEmployeeContractInfo));
}
......@@ -263,6 +285,13 @@ public class TEmployeeContractInfoController {
@SysLog("批量导出合同")
@PostMapping("/exportContractInfo")
public void exportContractInfo(@RequestBody(required = false) TEmployeeContractInfo contractInfo, HttpServletResponse response) {
YifuUser user = SecurityUtils.getUser();
if (user != null && !Common.isEmpty(user.getId())) {
menuUtil.setAuthSql(user, contractInfo);
if (Common.isNotNull(contractInfo.getAuthSql()) && contractInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
contractInfo.setAuthSql(contractInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
}
tEmployeeContractInfoService.exportContractInfo(contractInfo, response);
}
......@@ -276,6 +305,13 @@ public class TEmployeeContractInfoController {
@SysLog("批量导出合同[历史]")
@PostMapping("/exportContractInfoHistory")
public void exportContractInfoHistory(@RequestBody(required = false) TEmployeeContractInfo contractInfo, HttpServletResponse response) {
YifuUser user = SecurityUtils.getUser();
if (user != null && !Common.isEmpty(user.getId())) {
menuUtil.setAuthSql(user, contractInfo);
if (Common.isNotNull(contractInfo.getAuthSql()) && contractInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
contractInfo.setAuthSql(contractInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
}
tEmployeeContractInfoService.exportContractInfoHistory(contractInfo, response);
}
......
......@@ -83,7 +83,7 @@ public class TEmployeeInfoController {
}
menuUtil.setAuthSql(user, tEmployeeInfo);
if (Common.isNotNull(tEmployeeInfo.getAuthSql()) && tEmployeeInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tEmployeeInfo.setAuthSql(tEmployeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.id"));
tEmployeeInfo.setAuthSql(tEmployeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.DEPT_ID"));
}
return R.ok(tEmployeeInfoService.getPage(page, tEmployeeInfo));
}
......@@ -107,7 +107,7 @@ public class TEmployeeInfoController {
}
menuUtil.setAuthSql(user, tEmployeeInfo);
if (Common.isNotNull(tEmployeeInfo.getAuthSql()) && tEmployeeInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tEmployeeInfo.setAuthSql(tEmployeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.id"));
tEmployeeInfo.setAuthSql(tEmployeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.DEPT_ID"));
}
return R.ok(tEmployeeInfoService.getLeavePage(page, tEmployeeInfo));
}
......@@ -304,10 +304,10 @@ public class TEmployeeInfoController {
@PostMapping("/exportEmployee")
public void exportEmployee(@RequestBody(required = false) TEmployeeInfo employeeInfo, HttpServletResponse response) {
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isEmpty(user.getId())) {
if (user != null && Common.isNotNull(user.getId())) {
menuUtil.setAuthSql(user, employeeInfo);
if (Common.isNotNull(employeeInfo.getAuthSql()) && employeeInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
employeeInfo.setAuthSql(employeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.id"));
employeeInfo.setAuthSql(employeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.DEPT_ID"));
}
}
tEmployeeInfoService.exportEmployee(employeeInfo, response);
......@@ -325,10 +325,10 @@ public class TEmployeeInfoController {
@PostMapping("/exportLeaveEmployee")
public void exportLeaveEmployee(@RequestBody(required = false) TEmployeeInfo employeeInfo, HttpServletResponse response) {
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isEmpty(user.getId())) {
if (user != null && Common.isNotNull(user.getId())) {
menuUtil.setAuthSql(user, employeeInfo);
if (Common.isNotNull(employeeInfo.getAuthSql()) && employeeInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
employeeInfo.setAuthSql(employeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.id"));
employeeInfo.setAuthSql(employeeInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "b.DEPT_ID"));
}
}
tEmployeeInfoService.exportLeaveEmployee(employeeInfo, response);
......
......@@ -264,7 +264,7 @@ public class TEmployeeProjectController {
public void export(HttpServletResponse response, @RequestParam(name = "idstr", required = false)String idstr,
@RequestBody List<String> exportFields, EmployeeProjectExportVO projectDTO) {
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isEmpty(user.getId())) {
if (user != null && Common.isNotNull(user.getId())) {
menuUtil.setAuthSql(user, projectDTO);
}
tEmployeeProjectService.listExportProject(response,projectDTO,idstr,exportFields);
......
......@@ -64,6 +64,7 @@ public class TSettleDomainController {
* @param tSettleDomain 项目表
* @return
*/
// 2022-9-27 16:36:56hgw备注:前端用这个接口模糊搜索项目信息:/yifu-archives/method/tempchangeinfo/getAllDeptPage
@Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page")
public R<IPage<TSettleDomain>> getTSettleDomainPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
......
package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.LExcelHeadForIo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @Author fxj
* @Description 用户表格导入导出默认表头数据
* @Date 10:08 2022/9/20
* @Param
* @return
**/
@Mapper
public interface LExcelHeadForIoMapper extends BaseMapper<LExcelHeadForIo> {
/**
* 用户表格导入导出默认表头数据简单分页查询
* @param lExcelHeadForIo 用户表格导入导出默认表头数据
* @return
*/
IPage<LExcelHeadForIo> getLExcelHeadForIoPage(Page page, @Param("lExcelHeadForIo") LExcelHeadForIo lExcelHeadForIo);
}
......@@ -18,9 +18,11 @@
package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -35,6 +37,7 @@ import java.util.List;
@Mapper
public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
IPage<TSettleDomain> getPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
/**
* @param departNo
* @Author: wangan
......
package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.LExcelHeadForIo;
/**
* @Author fxj
* @Description 用户表格导入导出默认表头数据
* @Date 10:08 2022/9/20
* @Param
* @return
**/
public interface LExcelHeadForIoService extends IService<LExcelHeadForIo> {
/**
* 用户表格导入导出默认表头数据简单分页查询
*
* @param lExcelHeadForIo 用户表格导入导出默认表头数据
* @return
*/
IPage<LExcelHeadForIo> getLExcelHeadForIoPage(Page<LExcelHeadForIo> page, LExcelHeadForIo lExcelHeadForIo);
}
......@@ -40,7 +40,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
/**
* @param employeeInfo
* @param sql
* @Description: 分页查询
* @Author: hgw
* @Date: 2022/6/20 20:46
......
......@@ -17,16 +17,16 @@
package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import java.util.List;
import java.util.Map;
/**
* 项目表
......@@ -35,6 +35,9 @@ import java.util.Map;
* @date 2022-06-20 10:02:28
*/
public interface TSettleDomainService extends IService<TSettleDomain> {
IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
/**
* 清除userId的项目权限缓存
*
......
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.LExcelHeadForIo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.LExcelHeadForIoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.LExcelHeadForIoService;
import org.springframework.stereotype.Service;
/**
* @Author fxj
* @Description 用户表格导入导出默认表头数据
* @Date 10:08 2022/9/20
* @Param
* @return
**/
@Service("lExcelHeadForIoService")
public class LExcelHeadForIoServiceImpl extends ServiceImpl<LExcelHeadForIoMapper, LExcelHeadForIo> implements LExcelHeadForIoService {
/**
* 用户表格导入导出默认表头数据简单分页查询
*
* @param lExcelHeadForIo 用户表格导入导出默认表头数据
* @return
*/
@Override
public IPage<LExcelHeadForIo> getLExcelHeadForIoPage(Page<LExcelHeadForIo> page, LExcelHeadForIo lExcelHeadForIo) {
return baseMapper.getLExcelHeadForIoPage(page, lExcelHeadForIo);
}
}
......@@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCertRecord;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCertRecordMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
......@@ -37,6 +34,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
......@@ -123,9 +121,10 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
public IPage<TCertRecord> pageDiy(Page page, CertRecordSearchVo searchVo) {
LambdaQueryWrapper<TCertRecord> wrapper = buildQueryWrapper(searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
wrapper.last(searchVo.getAuthSql());
wrapper.last(searchVo.getAuthSql() + " order by CREATE_TIME desc");
} else {
wrapper.orderByDesc(BaseEntity::getCreateTime);
}
wrapper.orderByDesc(TCertRecord::getCreateTime);
return baseMapper.selectPage(page,wrapper);
}
......@@ -143,6 +142,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
}
private LambdaQueryWrapper buildQueryWrapper(CertRecordSearchVo entity){
LambdaQueryWrapper<TCertRecord> wrapper = Wrappers.lambdaQuery();
wrapper.ne(TCertRecord::getId,CommonConstants.ZERO_STRING);
if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
wrapper.ge(TCertRecord::getOpenTime, entity.getCreateTimes()[0])
.le(TCertRecord::getOpenTime,
......
......@@ -308,7 +308,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
private LambdaQueryWrapper buildQueryWrapper(String deptName) {
LambdaQueryWrapper<TSettleDomain> wrapper = Wrappers.lambdaQuery();
if (Common.isNotNull(deptName)) {
wrapper.likeRight(TSettleDomain::getDepartName, deptName);
wrapper.like(TSettleDomain::getDepartName, deptName);
}
wrapper.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING);
wrapper.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING);
......
......@@ -65,7 +65,11 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Override
public IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo) {
LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
wrapper.orderByDesc(BaseEntity::getCreateTime);
if (Common.isNotNull(searchVo.getAuthSql())) {
wrapper.last(searchVo.getAuthSql() + " order by CREATE_TIME desc");
} else {
wrapper.orderByDesc(BaseEntity::getCreateTime);
}
return baseMapper.selectPage(page,wrapper);
}
......@@ -76,6 +80,10 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
if (Common.isNotNull(idList)){
wrapper.in(TEmpContractAlert::getId,idList);
}
wrapper.ne(TEmpContractAlert::getId,CommonConstants.ZERO_STRING);
if (Common.isNotNull(searchVo.getAuthSql())) {
wrapper.last(searchVo.getAuthSql());
}
return baseMapper.selectList(wrapper);
}
......@@ -85,6 +93,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
if (Common.isNotNull(idList)){
wrapper.in(TEmpContractAlert::getId,idList);
}
if (Common.isNotNull(searchVo.getAuthSql())) {
wrapper.last(searchVo.getAuthSql());
}
if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() >= 0){
wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
}
......@@ -152,6 +163,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
private LambdaQueryWrapper buildQueryWrapper(ContractAlertSearchVo entity){
LambdaQueryWrapper<TEmpContractAlert> wrapper = Wrappers.lambdaQuery();
wrapper.ne(TEmpContractAlert::getId,CommonConstants.ZERO_STRING);
if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
wrapper.ge(TEmpContractAlert::getCreateTime, entity.getCreateTimes()[0])
.le(TEmpContractAlert::getCreateTime,
......@@ -304,11 +316,14 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}else {
alert.setFirstAlertTime(new Date());
}
alert.setCreateBy(contract.getCreateBy());
alert.setCreateName(contract.getCreateName());
alert.setContractId(contract.getId());
alert.setAlertPerson(contract.getCreateName());
alert.setEmpName(contract.getEmpName());
alert.setEmpId(contract.getEmpId());
alert.setEmpCode(contract.getEmpNo());
alert.setDeptId(contract.getSettleDomain());
alert.setProject(contract.getSubjectDepart());
alert.setProjectNo(contract.getDeptNo());
alert.setEmpIdcard(contract.getEmpIdcard());
......
......@@ -109,7 +109,7 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
}
// 数据合法情况
insertExcel(excel,emp);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
}
}
......
......@@ -553,8 +553,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
errorVo.setMainName(contractInfo.getApplyNo());
if (!user.getId().equals(contractInfo.getCreateBy())) {
errorVo.setErrorInfo(EmployeeContractConstants.NOT_CREATE_USER);
} else if (contractInfo.getAuditStatus() != CommonConstants.ZERO_INT
&& contractInfo.getAuditStatus() != CommonConstants.dingleDigitIntArray[3]) {
} else if (contractInfo.getAuditStatus() != CommonConstants.ZERO_INT) {
errorVo.setErrorInfo(EmployeeContractConstants.NOT_AUDIT_STATUS);
} else {
errorVo.setResult(CommonConstants.ONE_INT);
......@@ -844,7 +843,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
insert.setContractEnd(contractInfo.getContractEnd());
}
} else {
if (!EmployeeConstants.CONTRACT_TYPE_TWO.equals(insert.getContractType())
// 2022-9-28 16:59:57 徐梅说产品在验收时,业务说已完成一定任务的也不必填
if (EmployeeConstants.CONTRACT_TYPE_ONE.equals(insert.getContractType())
&& Common.isEmpty(insert.getContractEnd())) {
errorInfo.append(EmployeeConstants.CONTRACT_END_MUST);
}
......
......@@ -558,6 +558,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMessageVO = this.getErrorMessageVO(i, CommonConstants.ZERO_INT, excel.getEmpName()
, excel.getEmpIdcard(), errorMsg);
} else {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_TRUE, excel.getEmpIdcard()));
errorMessageVO = this.getErrorMessageVO(i, CommonConstants.ONE_INT, excel.getEmpName()
, excel.getEmpIdcard(), errorMsg);
}
......@@ -2247,8 +2248,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
for (Map.Entry<String, EmpProjectDispatchVo> entry : projectsMap.entrySet()) {
projectAdd = entry.getValue();
try {
if (Common.isNotNull(projectAdd)) ;
{
if (Common.isNotNull(projectAdd)) {
project = new TEmployeeProject();
BeanUtil.copyProperties(projectAdd, project);
if (Common.isEmpty(project.getEmpId()) && Common.isNotNull(empAddsMap)) {
......
......@@ -16,8 +16,12 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCutsomerDataPermisson;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
......@@ -37,7 +41,9 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
......@@ -58,6 +64,12 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
private UpmsDaprUtils upmsDaprUtils;
private final TCutsomerDataPermissonMapper permissonMapper;
@Override
public IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
return baseMapper.getPage(page, tSettleDomain);
}
/**
* @Author fxj
* @Description 清除项目缓存
......@@ -112,10 +124,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Override
public List<TSettleDomainSelectVo> selectAllSettleDomainSelectVos() {
List<TSettleDomainSelectVo> sdList = baseMapper.selectAllSettleDomainSelectVos();
return sdList;
return baseMapper.selectAllSettleDomainSelectVos();
}
@Transactional
@Override
public R updateProjectInfo(List<TSettleDomain> list) {
if (Common.isNotNull(list)) {
......@@ -141,7 +153,22 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
}
}
tSettleDomainInfo = baseMapper.selectById(tSettleDomain.getId());
tSettleDomainInfo = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(TSettleDomain::getDepartNo,tSettleDomain.getDepartNo())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(tSettleDomainInfo)) {
tSettleDomain.setId(tSettleDomainInfo.getId());
}
// 处理服务团队数据权限 2022-09-19 fxj
if (Common.isNotNull(tSettleDomain.getServiceTeam())){
R<AllUserNaVo> res = upmsDaprUtils.getUserIdsByUserNames(tSettleDomain.getServiceTeam());
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserIds())){
// 先清理缓存
this.removeSettleCache(null,res.getData().getUserIds());
saveForEkp(res.getData().getUserIds(),tSettleDomain.getId());
}
}
if (Common.isNotNull(tSettleDomainInfo)) {
baseMapper.updateById(tSettleDomain);
} else {
......@@ -163,4 +190,36 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
return setMap;
}
/**
* @Author fxj
* @Description 更新EKP对应MVP 项目权限,已有权限不做删除处理
* @Date 17:17 2022/9/19
* @Param
* @return
**/
public boolean saveForEkp(List<String> userIds, String domainId){
// 1. 先清除现有的这些认的项目权限
permissonMapper.delete(Wrappers.<TCutsomerDataPermisson>query().lambda()
.in(TCutsomerDataPermisson::getBePermissonUser,userIds)
.eq(TCutsomerDataPermisson::getSettleDomainId,domainId));
// 2.新增新的项目人员权限
TCutsomerDataPermisson pm;
if (Common.isNotNull(userIds)){
for (String uId:userIds){
pm = new TCutsomerDataPermisson();
pm.setIsCustomerService(CommonConstants.ZERO_STRING);
pm.setIsOwner(CommonConstants.ONE_STRING);
pm.setPermissonSrc("EKP服务团队");
pm.setPermissonLevel(CommonConstants.ONE_INT);
pm.setBePermissonUser(uId);
pm.setBePermissionTime(LocalDateTime.now());
pm.setSettleDomainId(domainId);
pm.setPermissionUser(CommonConstants.ONE_STRING);
pm.setType(CommonConstants.TWO_STRING);
permissonMapper.insert(pm);
}
}
return true;
}
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.LExcelHeadForIoMapper">
<resultMap id="lExcelHeadForIoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.LExcelHeadForIo">
<id property="id" column="id"/>
<result property="createUser" column="create_user"/>
<result property="createTime" column="create_time"/>
<result property="useCode" column="use_code"/>
<result property="excelHeadText" column="excel_head_text"/>
<result property="remark" column="remark"/>
<result property="name" column="name"/>
</resultMap>
<sql id="Base_Column_List">
a.id,
a.create_user,
a.create_time,
a.use_code,
a.excel_head_text,
a.remark,
a.name
</sql>
<sql id="lExcelHeadForIo_where">
<if test="lExcelHeadForIo != null">
<if test="lExcelHeadForIo.id != null and lExcelHeadForIo.id.trim() != ''">
AND a.id = #{lExcelHeadForIo.id}
</if>
<if test="lExcelHeadForIo.createUser != null and lExcelHeadForIo.createUser.trim() != ''">
AND a.create_user = #{lExcelHeadForIo.createUser}
</if>
<if test="lExcelHeadForIo.createTime != null">
AND a.create_time = #{lExcelHeadForIo.createTime}
</if>
<if test="lExcelHeadForIo.useCode != null and lExcelHeadForIo.useCode.trim() != ''">
AND a.use_code = #{lExcelHeadForIo.useCode}
</if>
<if test="lExcelHeadForIo.excelHeadText != null and lExcelHeadForIo.excelHeadText.trim() != ''">
AND a.excel_head_text = #{lExcelHeadForIo.excelHeadText}
</if>
<if test="lExcelHeadForIo.remark != null and lExcelHeadForIo.remark.trim() != ''">
AND a.remark = #{lExcelHeadForIo.remark}
</if>
</if>
</sql>
<!--lExcelHeadForIo简单分页查询-->
<select id="getLExcelHeadForIoPage" resultMap="lExcelHeadForIoMap">
SELECT
<include refid="Base_Column_List"/>
FROM l_excel_head_for_io a
<where>
1=1
<include refid="lExcelHeadForIo_where"/>
</where>
</select>
</mapper>
......@@ -397,7 +397,11 @@
<where>
a.DELETE_FLAG = 0
<include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql}
</if>
</where>
GROUP BY a.id
order by a.CREATE_TIME desc
</select>
......@@ -421,7 +425,11 @@
<where>
a.DELETE_FLAG = 0
<include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql}
</if>
</where>
GROUP BY a.id
order by a.CREATE_TIME desc
</select>
......@@ -437,6 +445,9 @@
<where>
a.DELETE_FLAG = 0 and a.AUDIT_TIME_LAST is not null and a.SITUATION != '作废' and a.SITUATION != '终止'
<include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql}
</if>
</where>
GROUP BY a.EMP_IDCARD,a.SETTLE_DOMAIN
order by a.CREATE_TIME desc
......
......@@ -295,7 +295,7 @@
AND a.EMP_NATRUE = #{tEmployeeInfo.empNatrue}
</if>
<if test="tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''">
AND a.EMP_NAME = #{tEmployeeInfo.empName}
AND a.EMP_NAME like concat('%',#{tEmployeeInfo.empName},'%')
</if>
<if test="tEmployeeInfo.empIdcard != null and tEmployeeInfo.empIdcard.trim() != ''">
AND a.EMP_IDCARD = #{tEmployeeInfo.empIdcard}
......@@ -491,8 +491,8 @@
select
<include refid="baseParam"/>
from t_employee_info a
<if test="tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.contains('b.id') ">
left join t_employee_project b on a.id=b.EMP_ID
<if test="tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.contains('b.DEPT_ID') ">
left join t_employee_project b on a.id=b.EMP_ID and b.DELETE_FLAG = '0'
</if>
where a.DELETE_FLAG = '0'
<include refid="employeeInfo_where"/>
......@@ -517,8 +517,8 @@
,a.LEAVE_USER
,a.LEAVE_REASON
from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID
where a.DELETE_FLAG = '0' and b.DELETE_FLAG = '0'
left join t_employee_project b on a.id = b.EMP_ID and b.DELETE_FLAG = '0'
where a.DELETE_FLAG = '0'
<include refid="employeeInfo_where"/>
<if test="tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''">
${tEmployeeInfo.authSql}
......@@ -629,9 +629,9 @@
select
<include refid="Base_Export_List"/>
from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID
left join t_employee_project b on a.id = b.EMP_ID and b.DELETE_FLAG = '0'
<where>
a.DELETE_FLAG = '0' and b.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
<include refid="employeeInfo_where"/>
<if test="tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''">
${tEmployeeInfo.authSql}
......@@ -652,9 +652,9 @@
,a.LEAVE_USER_NAME
,a.LEAVE_REASON
from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID
left join t_employee_project b on a.id = b.EMP_ID and b.DELETE_FLAG = '0'
<where>
a.DELETE_FLAG = '0' and b.DELETE_FLAG = '0'
a.DELETE_FLAG = '0'
<include refid="employeeInfo_where"/>
<if test="tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.trim() != ''">
${tEmployeeInfo.authSql}
......
......@@ -300,7 +300,7 @@
AND a.BUSINESS_SECOND_TYPE = #{tEmployeeProject.businessSecondType}
</if>
<if test="tEmployeeProject.businessThirdType != null and tEmployeeProject.businessThirdType.trim() != ''">
AND a.BUSINESS_THIRD_TYPE = #{tEmployeeProject.businessThirdType}
AND a.BUSINESS_THIRD_TYPE like CONCAT('%',#{tEmployeeProject.businessThirdType},'%')
</if>
<if test="tEmployeeProject.contractType != null and tEmployeeProject.contractType.trim() != ''">
AND a.CONTRACT_TYPE = #{tEmployeeProject.contractType}
......
......@@ -196,6 +196,27 @@
<result property="bpoFlag" column="BPO_FLAG"/>
</resultMap>
<select id="getPage" resultMap="tSettleDomainMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_settle_domain a
WHERE 1=1
<if test="tSettleDomain != null">
<if test="tSettleDomain.departName != null and tSettleDomain.departName.trim() != ''">
and a.DEPART_NAME like concat('%', #{tSettleDomain.departName} ,'%')
</if>
<if test="tSettleDomain.departNo != null and tSettleDomain.departNo.trim() != ''">
and a.DEPART_NO = #{tSettleDomain.departNo}
</if>
<if test="tSettleDomain.deleteFlag != null and tSettleDomain.deleteFlag.trim() != ''">
and a.DELETE_FLAG = #{tSettleDomain.deleteFlag}
</if>
<if test="tSettleDomain.stopFlag != null and tSettleDomain.stopFlag.trim() != ''">
and a.STOP_FLAG = #{tSettleDomain.stopFlag}
</if>
</if>
</select>
<select id="selectSettleDomainSelectVosById"
resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
SELECT
......
......@@ -494,4 +494,5 @@ public interface CommonConstants {
public static final String ERROR_IMPORT = "执行异常";
// 权限使用的
public static final String A_DEPT_ID = "a.dept_id";
public static final String A_CREATE_BY = "a.CREATE_BY";
}
......@@ -504,4 +504,6 @@ public interface ErrorCodes {
* 派增异常: 失败项重新派单缴纳方式不可变更
*/
String EMP_DISPATCH_SOCIAL_PAYMENT_TYPE_NOT_SAME = "emp.dispatch.social.payment.type.same";
String ARCHIVES_IMPORT_EMP_TRUE = "archives.import.emp.true";
}
......@@ -59,11 +59,11 @@ public class Common {
* @author: fxj
*/
public static boolean isEmpty(Object obj) {
return null == obj || "".equals(obj);
return null == obj || "".equals(obj) || "null".equals(obj);
}
public static boolean isNotNull(Object obj) {
return null != obj && !"".equals(obj);
return null != obj && !"".equals(obj) && !"null".equals(obj);
}
public static boolean isNotEmpty(List obj) {
......@@ -71,7 +71,7 @@ public class Common {
}
public static boolean isNotNull(String obj) {
if (null != obj && !"".equals(obj) && !"undefined".equals(obj)) {
if (null != obj && !"".equals(obj) && !"undefined".equals(obj) && !"null".equals(obj)) {
return true;
}
return false;
......
......@@ -195,6 +195,8 @@ emp.dispatch.social.hold.same=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5931\u8D25\u9879\
emp.dispatch.social.payment.type.same=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5931\u8D25\u9879\u91CD\u65B0\u6D3E\u5355\u7F34\u7EB3\u65B9\u5F0F\u4E0D\u53EF\u53D8\u66F4
archives.import.emp.true=\u4FE1\u606F\u6821\u9A8C\u901A\u8FC7\uFF0C\u4F46\u5176\u4ED6\u884C\u5B58\u5728\u95EE\u9898\u6570\u636E\uFF0C\u8BF7\u8C03\u6574\u540E\uFF0C\u7EDF\u4E00\u51CF\u6863
......
......@@ -37,10 +37,13 @@ public class MenuUtil {
public void setAuthSql(YifuUser user, BaseEntity entity) {
// 普通用户:
if (CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
if (user != null && Common.isNotNull(user.getId()) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
// 菜单id
String menuId = entity.getMId();
if (Common.isEmpty(menuId)) {
menuId = entity.getMenuInfo();
}
if (Common.isNotNull(menuId)) {
String linkId = user.getId();
int linkType = 1; // 用户
......@@ -75,7 +78,7 @@ public class MenuUtil {
}
if (Common.isNotNull(obj)) {
SimpleValueWrapper objs = (SimpleValueWrapper) obj;
if (objs != null) {
if (Common.isNotNull(objs)) {
String sql = String.valueOf(objs.get());
if (sql.contains("#create_by")) {
sql = sql.replace("#create_by", user.getId());
......@@ -86,7 +89,7 @@ public class MenuUtil {
, daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainIdsByUserId"
, user.getId(), TSettleDomainListVo.class, SecurityConstants.FROM_IN);
StringBuilder deptStr = new StringBuilder();
if (res != null && CommonConstants.SUCCESS != res.getCode()
if (res != null && CommonConstants.SUCCESS == res.getCode()
&& res.getData() != null && res.getData().getDeptIds() != null
&& !res.getData().getDeptIds().isEmpty()) {
for (String deptId : res.getData().getDeptIds()) {
......@@ -118,7 +121,9 @@ public class MenuUtil {
sql = sql.replace("#deptId", userIds);
//sql = sql.replace(" or dept.dept_id = #deptId ", "")
}
entity.setAuthSql(sql);
if (Common.isNotNull(sql)) {
entity.setAuthSql(sql);
}
}
}
}
......
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.alibaba.fastjson.JSON;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
......@@ -51,4 +52,19 @@ public class UpmsDaprUtils {
}
return allUserVoR;
}
/**
* @Author fxj
* @Description 获取指定用户名对应用户IDs
* @Date 17:57 2022/8/16
* @Param
* @return
**/
public R<AllUserNaVo> getUserIdsByUserNames(String usernames) {
R<AllUserNaVo> allUserVoR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/user/inner/getUserIdsByUserNames", usernames, AllUserNaVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(allUserVoR)){
return R.failed("获取指定用户名对应用户IDs失败!");
}
return allUserVoR;
}
}
......@@ -228,6 +228,12 @@ public class EkpInsuranceUtil {
}else{
pushParam.setFd_3b0a5937928c8c(CommonConstants.EMPTY_STRING);
}
//是否bro客户
if(null != param.getBpoFlag()){
pushParam.setFd_3b178f8ba1a91c(param.getBpoFlag());
}else{
pushParam.setFd_3b178f8ba1a91c(CommonConstants.EMPTY_STRING);
}
return pushParam;
}
}
......
......@@ -125,6 +125,13 @@ public class EKPInsurancePushParam {
*/
private String fd_3b0a5937928c8c;
/**
* 是否为BPO业务(是、否)
*/
private String fd_3b178f8ba1a91c;
......
......@@ -10,7 +10,7 @@ import java.util.Date;
@Data
@ToString
@Entry(objectClasses = {"posixAccount","top","inetOrgPerson"}, base = "ou=安徽皖信人力资源管理有限公司,ou=wanxin")
@Entry(objectClasses = {"posixAccount","top","inetOrgPerson"}, base = "ou=皖信人力集团,ou=wanxin")
public class PersonVo {
/**
......
......@@ -28,9 +28,6 @@ public class PersonAttributesMapper implements AttributesMapper<PersonVo> {
if (null != attributes.get("ou")) {
personVo.setDeptName((String) attributes.get("ou").get());
}
if (null != attributes.get("userPassword")) {
personVo.setPassword((String) attributes.get("userPassword").get());
}
return personVo;
}
}
......@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.ldap.core.LdapTemplate;
import javax.naming.AuthenticationException;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
......@@ -36,7 +35,7 @@ public class LdapUtil {
private static LdapContext ctx = null;
private static Control[] connCtls = null;
private static final Control[] connCtls = null;
/**
* @return List<SearchResultEntry>
......@@ -45,16 +44,14 @@ public class LdapUtil {
* @description get请求获取指定对象信息
**/
public List<SearchResultEntry> getAllPersonNamesWithTraditionalWay() {
List<SearchResultEntry> result = new ArrayList<SearchResultEntry>();
try {
LDAPConnection connection = new LDAPConnection(ldapProperties.getUrl(), ldapProperties.getPort(),
ldapProperties.getUserName(), ldapProperties.getPassword());
SearchRequest searchRequest = new SearchRequest(ldapProperties.getBaseDn(), SearchScope.SUB, "(objectclass=*)");
List<SearchResultEntry> result = new ArrayList<>();
try (LDAPConnection connection = new LDAPConnection(ldapProperties.getUrl(), ldapProperties.getPort(),
ldapProperties.getUserName(), ldapProperties.getPassword())) {
SearchRequest searchRequest = new SearchRequest(ldapProperties.getBaseDn(), SearchScope.SUB,
"(objectclass=*)");
searchRequest.addControl(new SubentriesRequestControl());
SearchResult searchResult = connection.search(searchRequest);
for (SearchResultEntry entry : searchResult.getSearchEntries()) {
result.add(entry);
}
result.addAll(searchResult.getSearchEntries());
} catch (LDAPException e) {
e.printStackTrace();
}
......@@ -62,15 +59,14 @@ public class LdapUtil {
}
public List<PersonVo> getAllPersons() {
List<PersonVo> list = ldapTemplate.search(query()
return ldapTemplate.search(query()
.where("objectclass").is("posixAccount"), new PersonAttributesMapper());
return list;
}
// 校验用户名密码的方法
public Boolean authenticate(String usr, String pwd) {
boolean valide = false;
if (pwd == null || pwd == "")
boolean valide;
if (pwd == null || "".equals(pwd))
return false;
if (ctx == null) {
getCtx();
......@@ -85,9 +81,6 @@ public class LdapUtil {
ctx.reconnect(connCtls);
valide = true;
closeCtx();
} catch (AuthenticationException e) {
log.error(userDN + " is not authenticated");
valide = false;
} catch (NamingException e) {
log.error(userDN + " is not authenticated");
valide = false;
......@@ -99,7 +92,7 @@ public class LdapUtil {
if (ctx != null) {
return;
}
Hashtable<String, String> env = new Hashtable<String, String>();
Hashtable<String, String> env = new Hashtable<>();
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
env.put(Context.PROVIDER_URL, "ldap://" + ldapProperties.getUrl() + ":" + ldapProperties.getPort() +
"/" + ldapProperties.getDn());
......@@ -120,7 +113,7 @@ public class LdapUtil {
}
public String getUserDN(String uid) {
String userDN = "";
StringBuilder userDN = new StringBuilder();
try {
SearchControls constraints = new SearchControls();
constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
......@@ -129,13 +122,13 @@ public class LdapUtil {
Object obj = en.nextElement();
if (obj instanceof javax.naming.directory.SearchResult) {
javax.naming.directory.SearchResult si = (javax.naming.directory.SearchResult) obj;
userDN += si.getName();
userDN += "," + ldapProperties.getDn();
userDN.append(si.getName());
userDN.append(",").append(ldapProperties.getDn());
}
}
} catch (Exception e) {
e.printStackTrace();
}
return userDN;
return userDN.toString();
}
}
......@@ -3,4 +3,4 @@ ldap.port=389
ldap.userName=cn=admin,dc=worfu,dc=com
ldap.password=yifu123456!
ldap.dn=dc=worfu,dc=com
ldap.baseDn=ou=\u5B89\u5FBD\u7696\u4FE1\u4EBA\u529B\u8D44\u6E90\u7BA1\u7406\u6709\u9650\u516C\u53F8,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file
ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file
......@@ -64,13 +64,21 @@ public class BaseEntity implements Serializable {
@TableField(fill = FieldFill.INSERT_UPDATE)
@ExcelIgnore
private LocalDateTime updateTime;
/**
* 菜单ID 获取查询权限使用
*/
@ExcelIgnore
@TableField(exist = false)
@ExcelIgnore
private String mId;
/**
* 菜单ID 获取导出权限使用
*/
@TableField(exist = false)
@ExcelIgnore
private String menuInfo;
/**
* 权限sql
*/
......
......@@ -1102,12 +1102,12 @@ public class InsurancesConstants {
public static final String GET_DEPT_DETAIL_ERROR = "获取项目信息失败:";
/**
* 获取项目信息失败
* errorList
*/
public static final String ERROR_LIST = "errorList";
/**
* 获取项目信息失败
* successList
*/
public static final String SUCCESS_LIST = "successList";
......@@ -1116,7 +1116,47 @@ public class InsurancesConstants {
*/
public static final String OSS_ERROR = "OSS文件上传接口异常:";
/**EKP异常重发失败原因*/
/**
* 商险不存在或已被删除
*/
public static final String EKP_INSURANCE_IS_DELETE_OR_EMPTY = "商险不存在或已被删除";
/**
* 结算类型发生变更
*/
public static final String EKP_SETTLE_TYPE_IS_CHANGE = "结算类型发生变更";
/**
* 结算id发生变更
*/
public static final String EKP_SETTLE_ID_IS_CHANGE = "结算id发生变更";
/**
* 预估结算信息已发送
*/
public static final String EKP_ESTIMATE_IS_PUSH = "预估结算信息已发送";
/**
* 实缴结算信息已发送
*/
public static final String EKP_ACTUAL_IS_PUSH = "实缴结算信息已发送";
/**
* 预估费用已进行结算
*/
public static final String EKP_ESTIMATE_STATUS_ERROR = "预估费用已进行结算";
/**
* 实缴费用已进行结算
*/
public static final String EKP_ACTUAL_STATUS_ERROR = "实缴费用已进行结算";
/**
* 存在与ekp系统交互异常,请联系管理员处理后再操作
*/
public static final String EKP_SEND_ERROR = "存在与ekp系统交互异常,请联系管理员处理后再操作";
}
......@@ -315,8 +315,12 @@ public class TInsuranceDetail extends BaseEntity {
@Schema(description = "减员id")
private String refundId;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
......
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -164,9 +165,14 @@ public class TInsuranceEkp implements Serializable {
/**
* 不重发原因
*/
@Schema(description = "不重发原因")
private String notResendMessage;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
private String bpoFlag;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
......@@ -176,4 +177,11 @@ public class EkpInteractiveParam implements Serializable {
*/
@Schema(description = "状态:有,无")
private String estimateStatus;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -16,6 +17,11 @@ import java.math.BigDecimal;
public class InsuranceAddParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
/**
* 员工姓名
*/
......@@ -170,4 +176,11 @@ public class InsuranceAddParam implements Serializable {
*/
@JsonIgnore
private Integer insuranceHandleCity;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -183,4 +184,11 @@ public class InsuranceBatchParam implements Serializable {
*/
@JsonIgnore
private LocalDate policyEnd;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -13,7 +14,7 @@ import java.util.List;
*/
@Data
@Schema(description = "导出办理请求参数")
public class InsuranceExportListParam implements Serializable {
public class InsuranceExportListParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = 3623027153213352936L;
/**
......@@ -46,12 +47,6 @@ public class InsuranceExportListParam implements Serializable {
@Schema(description = "商险id集合")
private List<String> idList;
/**
* 办理地分流sql
*/
@Schema(description = "办理地分流sql")
private String regionSql;
/**
* 购买类型, 1新增、3批增、4替换
*/
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author licancan
* @description 投保列表请求参数
......@@ -13,8 +16,7 @@ import java.util.List;
*/
@Data
@Schema(description = "投保列表请求参数")
public class InsuranceListParam implements Serializable {
private static final long serialVersionUID = -4692341622141432288L;
public class InsuranceListParam extends BaseEntity {
/**
* 项目编码
......@@ -70,30 +72,12 @@ public class InsuranceListParam implements Serializable {
@Schema(description = "项目编码列表")
private List<String> deptNoList;
/**
* 办理地分流sql
*/
@Schema(description = "办理地分流sql")
private String regionSql;
/**
* 保单办理人
*/
@Schema(description = "保单办理人")
private String updateBy;
/**
* 购买类型, 1新增、3批增、4替换
*/
@Schema(description = " 购买类型(派单类型), 1新增、3批增、4替换")
private Integer buyType;
/**
* 创建者-姓名
*/
@Schema(description = "派单人")
private String createName;
/**
* 派单开始时间
*/
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
......@@ -13,7 +14,7 @@ import java.io.Serializable;
*/
@Data
@Tag(name = "减员办理查询条件")
public class InsuranceRefundHandlingParam implements Serializable {
public class InsuranceRefundHandlingParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
......@@ -77,12 +78,6 @@ public class InsuranceRefundHandlingParam implements Serializable {
@Schema(description = "是否过期 0未过期 1已过期")
private Integer isOverdue;
/**
* 办理地分流sql
*/
@Schema(description = "办理地分流sql")
private String regionSql;
/**
* 办理人
*/
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
......@@ -14,7 +15,7 @@ import java.util.List;
*/
@Data
@Tag(name = "已减员查询列表参数")
public class InsuranceRefundParam implements Serializable {
public class InsuranceRefundParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
/**
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -100,4 +101,11 @@ public class InsuranceReplaceParam implements Serializable {
@JsonIgnore
private Integer settleType;
/**
* EKP的 是否BPO: 是 否
*/
@Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore
private String bpoFlag;
}
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;
......@@ -16,7 +15,7 @@ import java.util.List;
*/
@Data
@Tag(name = "订单商险列表查询")
public class InsuredOrderParam implements Serializable {
public class InsuredOrderParam extends BaseEntity {
/**
* 订单编号
*/
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
......@@ -19,7 +16,7 @@ import java.util.List;
*/
@Data
@Tag(name = "已投保列表查询条件")
public class InsuredParam implements Serializable {
public class InsuredParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
/**
......
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -13,7 +14,7 @@ import java.util.List;
*/
@Data
@Schema(description = "导出减员办理请求参数")
public class RefundExportListParam implements Serializable {
public class RefundExportListParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = 3623027153213352936L;
/**
......@@ -52,10 +53,4 @@ public class RefundExportListParam implements Serializable {
@Schema(description = "商险id集合")
private List<String> idList;
/**
* 办理地分流sql
*/
@Schema(description = "办理地分流sql")
private String regionSql;
}
......@@ -80,8 +80,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "投保分页查询", description = "投保分页查询")
@PostMapping("/getInsuranceListPage")
public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param));
public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param, mId));
}
/**
......@@ -94,8 +95,8 @@ public class TInsuranceDetailController {
@Operation(summary = "投保不分页查询", description = "投保不分页查询")
@PostMapping("/getInsuranceList")
@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_export')")
public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
return tInsuranceDetailService.getInsuranceList(param);
public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param,@RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceList(param,mId);
}
/**
......@@ -108,8 +109,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
@PostMapping("/getInsuranceHandleListPage")
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param, mId));
}
/**
......@@ -219,8 +221,9 @@ public class TInsuranceDetailController {
@Operation(summary = "导出办理", description = "导出办理")
@PostMapping("/getInsuranceExportList")
@PreAuthorize("@pms.hasPermission('handle_insure_export')")
public R<List<InsuranceExportListVO>> getInsuranceExportList(@RequestBody InsuranceExportListParam param) {
return tInsuranceDetailService.getInsuranceExportList(param);
public R<List<InsuranceExportListVO>> getInsuranceExportList(@RequestBody InsuranceExportListParam param,
@RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceExportList(param,mId);
}
/**
......@@ -345,8 +348,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "已投保列表分页查询", description = "已投保列表分页查询")
@PostMapping("/getInsuredListPage")
public R<IPage<InsuredListVo>> getInsuredListPage(Page<InsuredListVo> page, @RequestBody InsuredParam param) {
return R.ok(tInsuranceDetailService.getInsuredListPage(page,param));
public R<IPage<InsuredListVo>> getInsuredListPage(Page<InsuredListVo> page, @RequestBody InsuredParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuredListPage(page,param,mId));
}
/**
......@@ -372,8 +376,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "已减员列表分页查询", description = "已减员列表分页查询")
@PostMapping("/getInsuranceRefundPageList")
public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param) {
return tInsuranceDetailService.getInsuranceRefundPageList(page,param);
public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param,
@RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceRefundPageList(page,param,mId);
}
/**
......@@ -400,8 +405,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "减员办理列表分页查询", description = "减员办理列表分页查询")
@GetMapping("/getInsuranceRefundHandlingPageList")
public R<IPage<RefundExportListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page,InsuranceRefundHandlingParam param) {
return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingPageList(page,param));
public R<IPage<RefundExportListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page,InsuranceRefundHandlingParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingPageList(page,param,mId));
}
/**
......@@ -414,8 +420,8 @@ public class TInsuranceDetailController {
@Operation(summary = "导出减员列表", description = "导出减员列表")
@PostMapping("/getInsuranceRefundHandlingList")
@PreAuthorize("@pms.hasPermission('handle_down_export')")
public R getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param) {
return tInsuranceDetailService.getInsuranceRefundHandlingList(param);
public R getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param, @RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceRefundHandlingList(param,mId);
}
/**
......
......@@ -206,16 +206,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/
List<TInsuranceDetail> selectListByEmpIdcardNo(String empIdcardNo);
/**
* 查数据是否存在权限范围内
*
* @author zhaji
* @param regionSql
* @param id
* @return {@link TInsuranceDetail}
*/
TInsuranceDetail selectByRegionSql(@Param("regionSql") String regionSql, @Param("id") String id);
/**
* 商险订单减员列表查询
*
......
......@@ -47,7 +47,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link IPage<InsuranceListVO>}
*/
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param, String mId);
/**
* 投保不分页查询
......@@ -56,7 +56,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link R<List<InsuranceListVO>>}
*/
R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param);
R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param,String mId);
/**
* 投保办理分页查询
......@@ -66,7 +66,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link IPage<InsuranceListVO>}
*/
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param, String mId);
/**
* 商险新增
......@@ -137,7 +137,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link R<List<InsuranceExportListVO>>}
*/
R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param);
R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param, String mId);
/**
* 投保退回
......@@ -197,7 +197,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link IPage< InsuredListVo>}
*/
IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param);
IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param, String mId);
/**
* 已投保列表不分页查询
......@@ -216,7 +216,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link IPage< InsuranceRefundListVo >}
*/
R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param);
R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param, String mId);
/**
* 已减员列表导出
......@@ -235,7 +235,8 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link IPage< RefundExportListVo >}
*/
IPage<RefundExportListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param);
IPage<RefundExportListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param,
String mId);
/**
* 减员办理列表不分页查询
......@@ -244,7 +245,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link List< RefundExportListVo >}
*/
R<List<RefundExportListVo>> getInsuranceRefundHandlingList(RefundExportListParam param);
R<List<RefundExportListVo>> getInsuranceRefundHandlingList(RefundExportListParam param, String mId);
/**
* 减员办理
......
......@@ -61,7 +61,15 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
List<TInsuranceEkp> ekpRefundList = this.baseMapper.getEkpRefundList();
if (CollectionUtils.isNotEmpty(ekpRefundList)){
for (TInsuranceEkp tInsuranceEkp : ekpRefundList) {
LambdaUpdateWrapper<TInsuranceEkp> ekpUpdate = new LambdaUpdateWrapper<>();
ekpUpdate.eq(TInsuranceEkp :: getId,tInsuranceEkp.getId());
TInsuranceDetail byId = tInsuranceDetailService.getById(tInsuranceEkp.getDetailId());
if(Common.isEmpty(byId)){
ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_INSURANCE_IS_DELETE_OR_EMPTY);
update(ekpUpdate);
continue;
}
String defaultSettleId = byId.getDefaultSettleId();
String s = null;
String settleType = tInsuranceEkp.getSettleType();
......@@ -82,8 +90,6 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
settleUpdate.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId());
LambdaUpdateWrapper<TInsuranceDetail> detailUpdate = new LambdaUpdateWrapper<>();
detailUpdate.eq(TInsuranceDetail :: getId,tInsuranceEkp.getDetailId());
LambdaUpdateWrapper<TInsuranceEkp> ekpUpdate = new LambdaUpdateWrapper<>();
ekpUpdate.eq(TInsuranceEkp :: getId,tInsuranceEkp.getId());
//ekp结算信息
SettleVo settleVo = tInsuranceDetailService.getInsuranceDetailSettleStatus(tInsuranceEkp.getDetailId(), tInsuranceEkp.getDefaultSettleId());
if(settleType.equals(CommonConstants.ZERO_STRING)){
......@@ -96,21 +102,16 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
//如果结算类型不一致,预估已推送,结算id不一致,结算信息不为空
if(!settleTypeEquals || !settleIdEquals || !estimatePush){
if(!settleTypeEquals){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,CommonConstants.TWO_INT);
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_SETTLE_TYPE_IS_CHANGE);
}
if(!settleIdEquals){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,CommonConstants.TWO_INT);
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_SETTLE_ID_IS_CHANGE);
}
if(!estimatePush){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,CommonConstants.TWO_INT);
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_ESTIMATE_IS_PUSH);
}
ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
update(ekpUpdate);
if(!Common.isEmpty(settleVo)){
settleUpdate.set(TInsuranceSettle :: getEstimatePushTime,LocalDateTime.now())
.set(TInsuranceSettle ::getIsEstimatePush,CommonConstants.ONE_INT);
tInsuranceSettleService.update(settleUpdate);
}
continue;
} else{
ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
......@@ -132,6 +133,15 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if(CommonConstants.TWO_INT == pushType){
//如果结算类型不一致,实缴已推送,结算id不一致,则不再推送
if(!settleTypeEquals || !actualPush || !settleIdEquals){
if(!settleTypeEquals){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_SETTLE_TYPE_IS_CHANGE);
}
if(!settleIdEquals){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_SETTLE_ID_IS_CHANGE);
}
if(!actualPush){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_ACTUAL_IS_PUSH);
}
ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
update(ekpUpdate);
continue;
......@@ -165,11 +175,21 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if(CommonConstants.THREE_INT == pushType){
//如果结算类型不一致,结算类型不为空且已发送,结算id不一致
if(!settleIdEquals || !eStatus || !aStatus){
if(!settleIdEquals){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_SETTLE_ID_IS_CHANGE);
}
if(!eStatus){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_ESTIMATE_STATUS_ERROR);
}
if(!aStatus){
ekpUpdate.set(TInsuranceEkp :: getNotResendMessage,InsurancesConstants.EKP_ACTUAL_STATUS_ERROR);
}
ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
update(ekpUpdate);
continue;
}else{
ekpParam.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
ekpParam.setSettleType(CommonConstants.EMPTY_STRING);
s = ekpInsuranceUtil.sendToEkp(ekpParam);
if(StringUtils.isNotBlank(s)){
ekpUpdate.set(TInsuranceEkp :: getResendFlag ,CommonConstants.ONE_INT)
......@@ -225,10 +245,6 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
break;
}
}
}else{
ekpUpdate.set(TInsuranceEkp :: getResendFlag,CommonConstants.TWO_INT);
update(ekpUpdate);
continue;
}
}
//推送预估红冲信息
......@@ -258,9 +274,9 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
}
}
return R.ok("发送成功");
return R.ok("EKP重发成功");
}else{
return R.failed("无需要发送的信息");
return R.failed("无需要重新发送的EKP结算信息");
}
}
}
......@@ -34,6 +34,7 @@
<result property="pushType" column="PUSH_TYPE" jdbcType="TINYINT"/>
<result property="settleType" column="SETTLE_TYPE" jdbcType="VARCHAR"/>
<result property="notResendMessage" column="NOT_RESEND_MESSAGE" jdbcType="VARCHAR"/>
<result property="bpoFlag" column="BPO_FLAG" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
......@@ -45,7 +46,7 @@
POLICY_END,BUY_STANDARD,MEDICAL_QUOTA,
DIE_DISABLE_QUOTA,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
SETTLE_MONTH,INTERACTIVE_TYPE,RESEND_FLAG,
CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE,NOT_RESEND_MESSAGE
CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE,NOT_RESEND_MESSAGE,BPO_FLAG
</sql>
<select id="getEkpRefundList" resultMap="BaseResultMap">
......
......@@ -36,6 +36,12 @@ public class TOrder implements Serializable {
@Schema(description = "客户名称")
private String customerName;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
/**
* 项目名称
*/
......
package com.yifu.cloud.plus.v1.yifu.order.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
......@@ -13,8 +13,7 @@ import java.util.List;
*/
@Data
@Schema(description = "订单列表入参")
public class OrderListParam implements Serializable {
private static final long serialVersionUID = 2575913025864285604L;
public class OrderListParam extends BaseEntity {
/**
* 订单编号
*/
......
......@@ -28,10 +28,9 @@ public interface TOrderMapper extends BaseMapper<TOrder> {
* @author licancan
* @param page
* @param param
* @param userName
* @return {@link IPage<OrderListVO>}
*/
IPage<OrderListVO> getOrderPageList(Page<OrderListParam> page,@Param("param") OrderListParam param,@Param("userName") String userName);
IPage<OrderListVO> getOrderPageList(Page<OrderListParam> page,@Param("param") OrderListParam param);
/**
* 导出勾选查询结果
......
......@@ -4,11 +4,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
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.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpOrderUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpOrderParam;
......@@ -59,6 +67,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
private OSSUtil ossUtil;
@Resource
private EkpOrderUtil ekpOrderUtil;
@Resource
private MenuUtil menuUtil;
@Resource
private ArchivesDaprUtil archivesDaprUtil;
@Resource
private DaprUpmsProperties daprUpmsProperties;
/**
* 订单列表分页查询
......@@ -71,7 +85,21 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
@Override
public IPage<OrderListVO> getOrderPageList(Page<OrderListParam> page, OrderListParam param) {
YifuUser user = SecurityUtils.getUser();
IPage<OrderListVO> orderList = baseMapper.getOrderPageList(page,param,user.getUsername());
menuUtil.setAuthSql(user, param);
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("#create_name")) {
param.setAuthSql(param.getAuthSql().replace("#create_name", user.getUsername()));
}
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("#create_depts")) {
String userIds = "0";
R<String> userIdR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl()
,daprUpmsProperties.getAppId(),"/user/inner/getUserNamedByDeptIds",user.getDeptId()
, String.class, SecurityConstants.FROM_IN);
if (userIdR != null && CommonConstants.SUCCESS == userIdR.getCode()) {
userIds = userIdR.getData();
}
param.setAuthSql(param.getAuthSql().replace("#create_depts", userIds));
}
IPage<OrderListVO> orderList = baseMapper.getOrderPageList(page,param);
return orderList;
}
......@@ -85,6 +113,20 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
@Override
public R<List<OrderListVO>> getOrderList(OrderListParam param) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, param);
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("#create_name")) {
param.setAuthSql(param.getAuthSql().replace("#create_name", user.getUsername()));
}
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("#create_depts")) {
String userIds = "0";
R<String> userIdR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl()
,daprUpmsProperties.getAppId(),"/user/inner/getUserNamedByDeptIds",user.getDeptId()
, String.class, SecurityConstants.FROM_IN);
if (userIdR != null && CommonConstants.SUCCESS == userIdR.getCode()) {
userIds = userIdR.getData();
}
param.setAuthSql(param.getAuthSql().replace("#create_depts", userIds));
}
List<OrderListVO> list;
if (CollectionUtils.isNotEmpty(param.getIdList())){
list = baseMapper.getOrderListBySelect(param.getIdList());
......@@ -390,9 +432,26 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
}
if (CollectionUtils.isEmpty(vo.getHandleUserList())){
return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
} TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(vo.getDeptNo());
if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData();
if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
settleDomainR = tSettleDomainListVo.getListSelectVO();
for (TSettleDomainSelectVo vo1 :settleDomainR) {
BeanUtils.copyProperties(vo1,settleDomain);
}
}
}
TOrder order = new TOrder();
BeanUtils.copyProperties(vo,order);
if (Common.isNotNull(settleDomain) && Common.isNotNull(settleDomain.getId())) {
order.setDeptId(settleDomain.getId());
}
boolean save = this.save(order);
//处理指派人
if (save && CollectionUtils.isNotEmpty(vo.getHandleUserList())){
......
......@@ -29,39 +29,43 @@
</sql>
<select id="getOrderPageList" resultType="com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO">
select t.id as id,
t.ORDER_NO as orderNo,
t.CREATE_TIME as createTime,
t.CREATE_NAME as createName,
t.CUSTOMER_NAME as customerName,
t.DEPT_NAME as deptName,
t.DEPT_NO as deptNo,
t.ORDER_STATUS as orderStatus
from t_order t
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
select a.id as id,
a.ORDER_NO as orderNo,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName,
a.CUSTOMER_NAME as customerName,
a.DEPT_NAME as deptName,
a.DEPT_NO as deptNo,
a.ORDER_STATUS as orderStatus
from t_order a
left join t_order_handler h on h.ORDER_NO = a.ORDER_NO
where a.DELETE_FLAG = 0
<if test="param.orderNo != null and param.orderNo.trim() != ''">
and t.ORDER_NO = #{param.orderNo}
and a.ORDER_NO = #{param.orderNo}
</if>
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and t.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and t.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and t.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.customerName != null and param.customerName.trim() != ''">
and t.CUSTOMER_NAME = #{param.customerName}
and a.CUSTOMER_NAME = #{param.customerName}
</if>
<if test="param.deptName != null and param.deptName.trim() != ''">
and t.DEPT_NAME = #{param.deptName}
and a.DEPT_NAME = #{param.deptName}
</if>
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and t.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
and a.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.orderStatus != null">
and t.ORDER_STATUS = #{param.orderStatus}
and a.ORDER_STATUS = #{param.orderStatus}
</if>
ORDER BY t.CREATE_TIME DESC
<if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql}
</if>
GROUP BY a.ID
ORDER BY a.CREATE_TIME DESC
</select>
<select id="getOrderListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO">
......@@ -82,39 +86,43 @@
</select>
<select id="getOrderList" resultType="com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO">
select t.id as id,
t.ORDER_NO as orderNo,
t.CREATE_TIME as createTime,
t.CREATE_NAME as createName,
t.CUSTOMER_NAME as customerName,
t.DEPT_NAME as deptName,
t.DEPT_NO as deptNo,
t.ORDER_STATUS as orderStatus
from t_order t
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
select a.id as id,
a.ORDER_NO as orderNo,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName,
a.CUSTOMER_NAME as customerName,
a.DEPT_NAME as deptName,
a.DEPT_NO as deptNo,
a.ORDER_STATUS as orderStatus
from t_order a
left join t_order_handler h on h.ORDER_NO = a.ORDER_NO
where a.DELETE_FLAG = 0
<if test="param.orderNo != null and param.orderNo.trim() != ''">
and t.ORDER_NO = #{param.orderNo}
and a.ORDER_NO = #{param.orderNo}
</if>
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and t.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and t.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and t.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.customerName != null and param.customerName.trim() != ''">
and t.CUSTOMER_NAME = #{param.customerName}
and a.CUSTOMER_NAME = #{param.customerName}
</if>
<if test="param.deptName != null and param.deptName.trim() != ''">
and t.DEPT_NAME = #{param.deptName}
and a.DEPT_NAME = #{param.deptName}
</if>
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and t.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
and a.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.orderStatus != null">
and t.ORDER_STATUS = #{param.orderStatus}
and a.ORDER_STATUS = #{param.orderStatus}
</if>
ORDER BY t.CREATE_TIME DESC
<if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql}
</if>
GROUP BY a.ID
ORDER BY a.CREATE_TIME DESC
</select>
<select id="getOrderDetailById" resultType="com.yifu.cloud.plus.v1.yifu.order.vo.OrderDetailVO">
......
......@@ -40,10 +40,10 @@ public class THaveSalaryNoSocialExportVo implements Serializable {
/**
* 员工名称
*/
@Length(max = 32, message = "员工名称不能超过32个字符")
@ExcelAttribute(name = "员工名称", maxLength = 32,needExport=true)
@Schema(description = "员工名称", name = "employeeName")
@ExcelProperty(value = "员工名称")
@Length(max = 32, message = "员工姓名不能超过32个字符")
@ExcelAttribute(name = "员工姓名", maxLength = 32,needExport=true)
@Schema(description = "员工姓名", name = "员工姓名")
@ExcelProperty(value = "员工姓名")
private String employeeName;
/**
* 身份证号
......
......@@ -2,10 +2,15 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
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.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.SysMessageSalary;
import com.yifu.cloud.plus.v1.yifu.salary.service.SysMessageSalaryService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalarySearchVo;
......@@ -31,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
public class SysMessageSalaryController {
private final SysMessageSalaryService sysMessageSalaryService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
* @param page 分页对象
......@@ -41,6 +46,11 @@ public class SysMessageSalaryController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<SysMessageSalary>> getSysMessageSalaryPage(Page<SysMessageSalary> page, SysMessageSalary sysMessageSalary) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, sysMessageSalary);
if (Common.isNotNull(sysMessageSalary.getAuthSql()) && sysMessageSalary.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
sysMessageSalary.setAuthSql(sysMessageSalary.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID"));
}
return new R<>(sysMessageSalaryService.getSysMessageSalaryPage(page, sysMessageSalary));
}
......@@ -115,6 +125,11 @@ public class SysMessageSalaryController {
@PostMapping("/export")
public void export(HttpServletResponse response,
@RequestBody SysMessageSalarySearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID"));
}
sysMessageSalaryService.listExport(response,searchVo);
}
......
......@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TConfigSalary;
import com.yifu.cloud.plus.v1.yifu.salary.service.TConfigSalaryService;
import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants;
......@@ -33,7 +38,7 @@ import java.util.List;
public class TConfigSalaryController {
private final TConfigSalaryService tConfigSalaryService;
private final MenuUtil menuUtil;
/**
* @param settleDepart 结算主体id
* @Description: 获取结算主体下的配置信息
......@@ -64,6 +69,11 @@ public class TConfigSalaryController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tConfigSalary);
if (Common.isNotNull(tConfigSalary.getAuthSql()) && tConfigSalary.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tConfigSalary.setAuthSql(tConfigSalary.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID"));
}
return tConfigSalaryService.getTConfigSalaryPage(page, tConfigSalary);
}
......
......@@ -20,8 +20,13 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TDeptSee;
import com.yifu.cloud.plus.v1.yifu.salary.service.TDeptSeeService;
import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants;
......@@ -49,7 +54,7 @@ public class TDeptSeeController {
private final TDeptSeeService tDeptSeeService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
*
......@@ -60,6 +65,11 @@ public class TDeptSeeController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TDeptSee>> getTDeptSeePage(Page<TDeptSee> page, TDeptSeeSearchVo tDeptSee) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDeptSee);
if (Common.isNotNull(tDeptSee.getAuthSql()) && tDeptSee.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDeptSee.setAuthSql(tDeptSee.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.ID"));
}
return new R<>(tDeptSeeService.getTDeptSeePage(page, tDeptSee));
}
......
......@@ -2,10 +2,15 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
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.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.service.THaveSalaryNosocialService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.THaveSalaryNosocialSearchVo;
......@@ -35,7 +40,7 @@ import javax.validation.Valid;
public class THaveSalaryNosocialController {
private final THaveSalaryNosocialService tHaveSalaryNosocialService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
*
......@@ -46,6 +51,11 @@ public class THaveSalaryNosocialController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<THaveSalaryNosocial>> getTHaveSalaryNosocialPage(Page<THaveSalaryNosocial> page, THaveSalaryNosocial tHaveSalaryNosocial) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tHaveSalaryNosocial);
if (Common.isNotNull(tHaveSalaryNosocial.getAuthSql()) && tHaveSalaryNosocial.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tHaveSalaryNosocial.setAuthSql(tHaveSalaryNosocial.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
return new R<>(tHaveSalaryNosocialService.getTHaveSalaryNosocialPage(page, tHaveSalaryNosocial));
}
......@@ -129,6 +139,11 @@ public class THaveSalaryNosocialController {
@PostMapping("/export")
public void export(HttpServletResponse response,
@RequestBody THaveSalaryNosocialSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
tHaveSalaryNosocialService.listExport(response,searchVo);
}
......
......@@ -20,11 +20,18 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.config.DaprArchivesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.constants.SalaryConstants;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
......@@ -61,6 +68,9 @@ public class TSalaryAccountController {
private final TSalaryAccountItemService tSalaryAccountItemService;
private final MenuUtil menuUtil;
private final DaprArchivesProperties daprArchivesProperties;
/**
* 简单分页查询
......@@ -73,6 +83,42 @@ public class TSalaryAccountController {
@GetMapping("/page")
public R<IPage<TSalaryAccount>> getTSalaryAccountPage(Page<TSalaryAccount> page, TSalaryAccountSearchVo tSalaryAccount) {
tSalaryAccount.setDeleteFlag(CommonConstants.ZERO_INT);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tSalaryAccount);
return new R<>(tSalaryAccountService.getTSalaryAccountPage(page, tSalaryAccount));
}
/**
* 简单分页查询
*
* @param page 分页对象
* @param tSalaryAccount 工资报账主表(工资条)
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/pageOrder")
public R<IPage<TSalaryAccount>> getTSalaryAccountPageOrder(Page<TSalaryAccount> page, TSalaryAccountSearchVo tSalaryAccount) {
tSalaryAccount.setDeleteFlag(CommonConstants.ZERO_INT);
YifuUser user = SecurityUtils.getUser();
// 普通用户:
if (user != null && Common.isNotNull(user.getId()) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
String sql;
// 获取人员项目权限
R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl()
, daprArchivesProperties.getAppId(), "/tsettledomain/getSettleDomainIdsByUserId"
, user.getId(), TSettleDomainListVo.class, SecurityConstants.FROM_IN);
StringBuilder deptStr = new StringBuilder();
if (res != null && CommonConstants.SUCCESS == res.getCode()
&& res.getData() != null && res.getData().getDeptIds() != null
&& !res.getData().getDeptIds().isEmpty()) {
for (String deptId : res.getData().getDeptIds()) {
deptStr.append(",'").append(deptId).append("'");
}
}
sql = "and (1=2 or a.dept_id in ('0'#settleDomainId))";
sql = sql.replace("#settleDomainId", deptStr.toString());
tSalaryAccount.setAuthSql(sql);
}
return new R<>(tSalaryAccountService.getTSalaryAccountPage(page, tSalaryAccount));
}
......@@ -153,6 +199,8 @@ public class TSalaryAccountController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('salary_tsalaryaccount-export')")
public void export(HttpServletResponse response, @RequestBody TSalaryAccountSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
tSalaryAccountService.listExport(response, searchVo);
}
......
......@@ -19,8 +19,13 @@ package com.yifu.cloud.plus.v1.yifu.salary.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryEmployeeService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo;
......@@ -49,6 +54,7 @@ public class TSalaryEmployeeController {
private final TSalaryEmployeeService tSalaryEmployeeService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -60,6 +66,11 @@ public class TSalaryEmployeeController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TSalaryEmployee>> getTSalaryEmployeePage(Page<TSalaryEmployee> page, TSalaryEmployeeSearchVo tSalaryEmployee) {
YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
menuUtil.setAuthSql(user, tSalaryEmployee);
return new R<>(tSalaryEmployeeService.getTSalaryEmployeePage(page, tSalaryEmployee));
}
......@@ -140,6 +151,13 @@ public class TSalaryEmployeeController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('salary_tsalaryemployee-export')")
public void export(HttpServletResponse response, @RequestBody TSalaryEmployeeSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isNotNull(user.getId())) {
menuUtil.setAuthSql(user, searchVo);
}
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_CREATE_BY)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_CREATE_BY, "CREATE_BY"));
}
tSalaryEmployeeService.listExport(response, searchVo);
}
}
......@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
......@@ -52,7 +53,7 @@ import java.util.Date;
public class TSalaryStandardController {
private final TSalaryStandardService tSalaryStandardService;
private final MenuUtil menuUtil;
/**
* 简单分页查询-申请
*
......@@ -64,6 +65,8 @@ public class TSalaryStandardController {
@GetMapping("/pageApply")
public R<IPage<TSalaryStandard>> getTSalaryStandardPageApply(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
tSalaryStandard.setDeleteFlag(CommonConstants.ZERO_INT);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tSalaryStandard);
return new R<>(tSalaryStandardService.getTSalaryStandardPageApply(page, tSalaryStandard));
}
......@@ -77,7 +80,9 @@ public class TSalaryStandardController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TSalaryStandard>> getTSalaryStandardPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
YifuUser user = SecurityUtils.getUser();
tSalaryStandard.setDeleteFlag(CommonConstants.ZERO_INT);
menuUtil.setAuthSql(user, tSalaryStandard);
return new R<>(tSalaryStandardService.getTSalaryStandardPage(page, tSalaryStandard));
}
......@@ -131,6 +136,10 @@ public class TSalaryStandardController {
@PostMapping("/export")
//@PreAuthorize("@pms.hasPermission('salary_tsalarystandard-export')")
public void export(HttpServletResponse response, @RequestBody TSalaryStandardSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isNotNull(user.getId())) {
menuUtil.setAuthSql(user, searchVo);
}
tSalaryStandardService.listExport(response, searchVo);
}
......
......@@ -131,6 +131,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
configSalary = configSalaryService.getById(configId);
} else {
configSalary = configSalaryService.getById(CommonConstants.ONE_STRING);
if(Common.isEmpty(configSalary)) {
configSalary = new TConfigSalary();
}
}
try {
jsonString = URLDecoder.decode(jsonString, "UTF-8").replace("=", "");
......@@ -197,7 +200,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
}
} catch (Exception e) {
log.error(e.getMessage());
log.error("薪资导入异常:",e);
return R.failed("数据导入解析失败!");
}
......
......@@ -37,7 +37,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){
YifuUser user = SecurityUtils.getUser();
TSettleDomainListVo vo = null;
if (Common.isNotNull(user)) {
if (Common.isNotNull(user) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
R<TSettleDomainListVo> domainListVoR = archivesDaprUtil.getSettleDomainIdsByUserId(user.getId());
if (Common.isEmpty(domainListVoR)) {
return R.failed("调用结算服务失败");
......
......@@ -185,7 +185,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
List<THaveSalaryNoSocialExportVo> list = new ArrayList<>();
// TODO
List<String> settleDomainIds =null;
List<String> ids = null;
List<String> ids = Common.getList(searchVo.getIds());
String sql = null;
int count = noPageCountDiy(searchVo,settleDomainIds,ids,sql);
ServletOutputStream out = null;
......
......@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.util.BigDecimalUtils;
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.ExcelUtil;
......@@ -95,6 +96,10 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
if (Common.isNotNull(list)) {
ExcelUtil<TSalaryAccount> util = new ExcelUtil<>(TSalaryAccount.class);
for (TSalaryAccount vo : list) {
if (CommonConstants.THREE_STRING.equals(vo.getFormType())){
vo.setRelaySalary(vo.getRelaySalaryUnit());
vo.setSalaryTax(BigDecimalUtils.safeAdd(vo.getSalaryTax(),vo.getSalaryTaxUnit()));
}
util.convertEntity(vo, null, null, null);
}
}
......
......@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo;
import com.yifu.cloud.plus.v1.check.entity.TCheckMobile;
import com.yifu.cloud.plus.v1.check.vo.CheckBankNoVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCertRecord;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
......@@ -159,11 +160,15 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (Common.isNotNull(idList)) {
wrapper.in(TSalaryEmployee::getId, idList);
}
if (Common.isNotNull(searchVo.getAuthSql())) {
wrapper.last(searchVo.getAuthSql());
}
return baseMapper.selectCount(wrapper);
}
private LambdaQueryWrapper buildQueryWrapper(TSalaryEmployeeSearchVo entity) {
LambdaQueryWrapper<TSalaryEmployee> wrapper = Wrappers.lambdaQuery();
wrapper.ne(TSalaryEmployee::getId,CommonConstants.ZERO_STRING);
if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
wrapper.ge(TSalaryEmployee::getCreateTime, entity.getCreateTimes()[0])
.le(TSalaryEmployee::getCreateTime,
......
......@@ -130,8 +130,11 @@
FROM sys_message_salary a
left join t_feed_back b on a.ID=b.RELATE_ID
<where>
<include refid="sysMessageSalarySql"/>
<include refid="sysMessageSalary_where"/>
<include refid="sysMessageSalarySql"/>
<include refid="sysMessageSalary_where"/>
<if test="sysMessageSalary.authSql != null and sysMessageSalary.authSql.trim() != ''">
${sysMessageSalary.authSql}
</if>
order by a.CREATE_TIME desc
</where>
</select>
......@@ -300,6 +303,9 @@
1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=2) or (b.id is null))
<include refid="export_sql"/>
<if test="sysMessageSalary != null">
<if test="sysMessageSalary.authSql != null and sysMessageSalary.authSql.trim() != ''">
${sysMessageSalary.authSql}
</if>
<if test="sysMessageSalary.limitStart != null">
limit #{sysMessageSalary.limitStart},#{sysMessageSalary.limitEnd}
</if>
......@@ -316,6 +322,9 @@
<where>
1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=2) or (b.id is null))
<include refid="export_sql"/>
<if test="sysMessageSalary.authSql != null and sysMessageSalary.authSql.trim() != ''">
${sysMessageSalary.authSql}
</if>
</where>
</select>
<sql id="export_sql">
......
......@@ -32,7 +32,7 @@
SOCIAL_PRIORITY,
FUND_PRIORITY,
GRANT_TYPE
FROM t_config_salary
FROM t_config_salary a
<where>
1=1
<if test="tConfigSalary.id != null and tConfigSalary.id.trim() != ''">
......@@ -75,6 +75,9 @@
#{param}
</foreach>
</if>
<if test="tConfigSalary.authSql != null and tConfigSalary.authSql.trim() != ''">
${tConfigSalary.authSql}
</if>
</where>
order by CREATE_TIME DESC
</select>
......
......@@ -84,6 +84,9 @@
<where>
1=1
<include refid="tDeptSee_where"/>
<if test="tDeptSee.authSql != null and tDeptSee.authSql.trim() != ''">
${tDeptSee.authSql}
</if>
order by a.CREATE_TIME DESC
</where>
</select>
......
......@@ -156,6 +156,9 @@
AND b.REASON_TYPE = #{tHaveSalaryNosocial.reasonType}
</if>
<include refid="tHaveSalaryNosocial_where"/>
<if test="tHaveSalaryNosocial.authSql != null and tHaveSalaryNosocial.authSql.trim() != ''">
${tHaveSalaryNosocial.authSql}
</if>
</where>
</select>
......@@ -166,6 +169,9 @@
<where>
1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=1) or (b.id is null))
<include refid="tHaveSalaryNosocial_where"/>
<if test="tHaveSalaryNosocial.authSql != null and tHaveSalaryNosocial.authSql.trim() != ''">
${tHaveSalaryNosocial.authSql}
</if>
<!--数据权限判断-->
<if test="settleDomainVos != null">
<if test="settleDomainVos.size() > 0">
......@@ -219,6 +225,9 @@
1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=1) or (b.id is null))
<include refid="export_where"/>
<if test="tHaveSalaryNosocial != null">
<if test="tHaveSalaryNosocial.authSql != null and tHaveSalaryNosocial.authSql.trim() != ''">
${tHaveSalaryNosocial.authSql}
</if>
<if test="tHaveSalaryNosocial.limitStart != null">
limit #{tHaveSalaryNosocial.limitStart},#{tHaveSalaryNosocial.limitEnd}
</if>
......@@ -233,6 +242,9 @@
<where>
1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=1) or (b.id is null))
<include refid="export_where"/>
<if test="tHaveSalaryNosocial.authSql != null and tHaveSalaryNosocial.authSql.trim() != ''">
${tHaveSalaryNosocial.authSql}
</if>
</where>
</select>
<sql id="export_where">
......
......@@ -352,6 +352,9 @@
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="tSalaryAccount_where"/>
<if test="tSalaryAccount.authSql != null and tSalaryAccount.authSql.trim() != ''">
${tSalaryAccount.authSql}
</if>
</where>
order by a.CREATE_TIME desc
</select>
......@@ -546,6 +549,9 @@
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/>
<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
${searchVo.authSql}
</if>
ORDER BY a.CREATE_TIME desc
<if test="searchVo != null">
<if test="searchVo.limitStart != null">
......@@ -582,6 +588,9 @@
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/>
<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
${searchVo.authSql}
</if>
</where>
</select>
<sql id="where_export">
......
......@@ -173,6 +173,9 @@
<where>
1=1
<include refid="tSalaryEmployee_where"/>
<if test="tSalaryEmployee.authSql != null and tSalaryEmployee.authSql.trim() != ''">
${tSalaryEmployee.authSql}
</if>
ORDER BY a.CREATE_TIME DESC
</where>
</select>
......@@ -184,6 +187,9 @@
<where>
1=1
<include refid="where_export"/>
<if test="tSalaryEmployee.authSql != null and tSalaryEmployee.authSql.trim() != ''">
${tSalaryEmployee.authSql}
</if>
ORDER BY a.CREATE_TIME DESC
</where>
<if test="tSalaryEmployee != null">
......
......@@ -269,6 +269,9 @@
<!-- 薪资是否可查看 0 是 1否-->
and (d.CAN_SEE = 0 OR d.id is null)
<include refid="tSalaryStandard_where"/>
<if test="tSalaryStandard.authSql != null and tSalaryStandard.authSql.trim() != ''">
${tSalaryStandard.authSql}
</if>
</where>
ORDER BY a.CREATE_TIME desc
</select>
......@@ -281,6 +284,9 @@
a.DELETE_FLAG = 0
<!-- 薪资是否可查看 0 是 1否-->
<include refid="tSalaryStandard_where"/>
<if test="tSalaryStandard.authSql != null and tSalaryStandard.authSql.trim() != ''">
${tSalaryStandard.authSql}
</if>
</where>
ORDER BY a.CREATE_TIME desc
</select>
......@@ -347,6 +353,9 @@
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/>
<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
${searchVo.authSql}
</if>
ORDER BY a.CREATE_TIME desc
<if test="searchVo != null">
<if test="searchVo.limitStart != null">
......@@ -364,6 +373,9 @@
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/>
<if test="searchVo.authSql != null and searchVo.authSql.trim() != ''">
${searchVo.authSql}
</if>
</where>
</select>
<sql id="where_page">
......
......@@ -17,8 +17,10 @@
package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
......@@ -39,7 +41,7 @@ import java.util.Date;
@Data
@TableName("t_income")
@Schema(description = "收入明细表")
public class TIncome {
public class TIncome{
/**
* 主键
......@@ -196,5 +198,17 @@ public class TIncome {
@ExcelAttribute(name = "发送返回的EKPID")
@ExcelProperty("发送返回的EKPID")
private String ekpId;
/**
* 菜单ID 获取查询权限使用
*/
@ExcelIgnore
@TableField(exist = false)
private String mId;
/**
* 权限sql
*/
@TableField(exist = false)
@ExcelIgnore
private String authSql;
}
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -36,8 +37,8 @@ public class FundHandleExportVo implements Serializable {
/**
* 员工身份证
*/
@ExcelAttribute(name = "员工身份证", errorInfo = "员工身份证不能为空", maxLength = 20,needExport = true)
@ExcelProperty("员工身份证" )
@ExcelAttribute(name = "身份证号", errorInfo = "身份证号不能为空", maxLength = 20,needExport = true)
@ExcelProperty("身份证号" )
private String empIdcard;
/**
* 所属单位
......@@ -89,6 +90,7 @@ public class FundHandleExportVo implements Serializable {
/**
* 公积金起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "公积金起缴日期", errorInfo = "公积金起缴日期不能为空",needExport = true)
@ExcelProperty("公积金起缴日期" )
private LocalDateTime providentStart;
......
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
......@@ -169,6 +171,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 合同起始时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "合同起始时间", errorInfo = "合同起始时间不能为空",dateFormat = DateUtil.ISO_DATE_FORMAT,needExport = true)
@Schema(description = "合同起始时间")
@ExcelProperty("合同起始时间" )
......@@ -176,6 +179,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 合同到期时间
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "合同到期时间",needExport = true,dateFormat = DateUtil.ISO_DATE_FORMAT)
@Schema(description = "合同到期时间")
@ExcelProperty("合同到期时间" )
......@@ -234,6 +238,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 养老起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "养老起缴日期", needExport = true)
@Schema(description="养老起缴日期")
@ExcelProperty("养老起缴日期" )
......@@ -250,6 +255,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 医疗起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "医疗起缴日期", needExport = true)
@Schema(description="医疗起缴日期")
@ExcelProperty("医疗起缴日期" )
......@@ -264,6 +270,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 失业起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "失业起缴日期", needExport = true)
@Schema(description="失业起缴日期")
@ExcelProperty("失业起缴日期" )
......@@ -278,6 +285,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 工伤起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "工伤起缴日期", needExport = true)
@Schema(description="工伤起缴日期")
@ExcelProperty("工伤起缴日期" )
......@@ -292,6 +300,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 生育起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "生育起缴日期", needExport = true)
@Schema(description="生育起缴日期")
@ExcelProperty("生育起缴日期" )
......@@ -306,6 +315,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 大病起缴日期
*/
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "大病起缴日期", needExport = true)
@Schema(description="大病起缴日期")
@ExcelProperty("大病起缴日期" )
......
......@@ -17,11 +17,14 @@
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
* 收入明细表
......@@ -30,7 +33,14 @@ import java.time.LocalDateTime;
* @date 2022-08-30 17:34:58
*/
@Data
public class TIncomeSearchVo extends TIncome {
public class TIncomeSearchVo extends BaseEntity implements Serializable {
private static final long serialVersionUID = -4692341622141432288L;
/**
* id
*/
@Schema(description = "id")
private String id;
/**
* 多选导出或删除等操作
......@@ -61,4 +71,106 @@ public class TIncomeSearchVo extends TIncome {
*/
@TableField(exist = false)
private String mId;
/**
* 员工姓名
*/
@Schema(description = "员工姓名")
private String empName;
/**
* 身份证号
*/
@Schema(description = "身份证号")
private String empIdcard;
/**
* 客户id
*/
@Schema(description = "客户id")
private String unitId;
/**
* 客户名称
*/
@Schema(description = "客户名称")
private String unitName;
/**
* 客户编码
*/
@Schema(description = "客户编码")
private String unitNo;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
/**
* 项目名称
*/
@Schema(description = "项目名称")
private String deptName;
/**
* 项目编码
*/
@Schema(description = "项目编码")
private String deptNo;
/**
* 费用类型:1管理费2风险金
*/
@Schema(description = "费用类型:1管理费2风险金")
private String feeType;
/**
* 收费方式:1按比例2金额-人数3金额-人次
*/
@Schema(description = "收费方式:1按比例2金额-人数3金额-人次")
private String feeMode;
/**
* 收费标准
*/
@Schema(description = "收费标准")
private String charges;
/**
* 收入来源:1社保2公积金3商险4薪资
*/
@Schema(description = "收入来源")
private String sourceType;
/**
* 金额
*/
@Schema(description = "金额")
private BigDecimal money;
/**
* 生成月份
*/
@Schema(description = "生成月份")
private String createMonth;
/**
* 缴纳月份
*/
@Schema(description = "缴纳月份")
private String payMonth;
/**
* 数据生成月份
*/
@Schema(description = "数据生成月份")
private String dataCreateMonth;
/**
* 红冲:0否1是
*/
@Schema(description = "红冲:0否1是")
private String redData;
/**
* 推送状态:0未推送1已推送
*/
@Schema(description = "送状态:0未推送1已推送")
private String sendStatus;
@Schema(description = "发送月份")
private String sendMonth;
@Schema(description = "发送时间")
private Date sendTime;
@Schema(description = "发送返回的EKPID")
private String ekpId;
}
......@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
......@@ -93,6 +94,31 @@ public class SysBaseSetInfoController {
return R.ok(baseSetInfo);
}
/**
* 通过户名称查询基数设置表
*
* @param houseHoldName 户名称
* @param type 类型 0.社保 1.公积金
* @return R
*/
@Operation(summary = "通过户名称查询", description = "通过户名称查询:type(0.社保 1.公积金) houseHoldName(社保户或公积金名称)")
@GetMapping("/getBaseSetByParam")
public R<SysBaseSetInfo> getBaseSetByParam(@RequestParam(name = "houseHoldName") String houseHoldName,
@RequestParam(name = "type") String type) {
// 在用 非删除 最近创建的一条配置数据
SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getDepartName,houseHoldName).eq(SysBaseSetInfo::getBaseType,type)
.eq(SysBaseSetInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(SysBaseSetInfo::getStatus,CommonConstants.ZERO_STRING)
.orderByDesc(BaseEntity::getCreateTime)
.last(CommonConstants.LAST_ONE_SQL));
if (null != baseSetInfo && CommonConstants.ONE_STRING.equals(baseSetInfo.getBaseType())){
baseSetInfo.setFundProList(sysPayProportionService.list(Wrappers.<SysPayProportion>query().lambda()
.eq(SysPayProportion::getSysBaseSetId,baseSetInfo.getId())));
}
return R.ok(baseSetInfo);
}
/**
* 新增基数设置表
*
......
......@@ -19,11 +19,16 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
......@@ -57,7 +62,10 @@ public class TDispatchInfoController {
private final TDispatchInfoService tDispatchInfoService;
private final MenuUtil menuUtil;
private final DaprArchivesProperties daprArchivesProperties;
/**
* 简单分页查询
* @param page 分页对象
......@@ -68,6 +76,12 @@ public class TDispatchInfoController {
@GetMapping("/page")
public R<IPage<TDispatchInfoPageVo>> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
......@@ -98,7 +112,52 @@ public class TDispatchInfoController {
}
tDispatchInfo.setCreateBy(user.getId());
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
/**
* 简单分页查询--申请
* @param page 分页对象
* @param tDispatchInfo 派单信息记录表--申请
* @return
*/
@Operation(description = "简单分页查询--申请")
@GetMapping("/pageApplyOrder")
public R<IPage<TDispatchInfoPageVo>> getTDispatchApplyPageOrder(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user)) {
return R.failed(CommonConstants.USER_FAIL);
}
tDispatchInfo.setCreateBy(user.getId());
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
if (user != null && Common.isNotNull(user.getId()) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
String sql;
// 获取人员项目权限
R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl()
, daprArchivesProperties.getAppId(), "/tsettledomain/getSettleDomainIdsByUserId"
, user.getId(), TSettleDomainListVo.class, SecurityConstants.FROM_IN);
StringBuilder deptStr = new StringBuilder();
if (res != null && CommonConstants.SUCCESS == res.getCode()
&& res.getData() != null && res.getData().getDeptIds() != null
&& !res.getData().getDeptIds().isEmpty()) {
for (String deptId : res.getData().getDeptIds()) {
deptStr.append(",'").append(deptId).append("'");
}
}
sql = "and (1=2 or a.dept_id in ('0'#settleDomainId))";
sql = sql.replace("#settleDomainId", deptStr.toString());
tDispatchInfo.setAuthSql(sql);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
}
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page, tDispatchInfo));
}
/**
......@@ -112,7 +171,13 @@ public class TDispatchInfoController {
public R<IPage<TDispatchInfoPageVo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
tDispatchInfo.setStatus(CommonConstants.ONE_STRING);
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
/**
......@@ -124,12 +189,14 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--社保办理列表")
@GetMapping("/pageSocialHandle")
public R<IPage<TDispatchInfo>> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
return new R<>(tDispatchInfoService.getTDispatchSocialHandlePage(page,tDispatchInfo,settleDomains,sql));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchSocialHandlePage(page,tDispatchInfo));
}
/**
......@@ -141,12 +208,14 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--公积金办理列表")
@GetMapping("/pageFundHandle")
public R<IPage<TDispatchInfo>> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
return new R<>(tDispatchInfoService.getTDispatchFundHandlePage(page,tDispatchInfo,settleDomains,sql));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchFundHandlePage(page,tDispatchInfo));
}
/**
* 通过id查询派单信息记录表
......@@ -237,7 +306,13 @@ public class TDispatchInfoController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('tdispatchinfo-export')")
public void export(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo) {
tDispatchInfoService.listExport(response,searchVo);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
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.setCreateBy(user.getId());
tDispatchInfoService.listExport(response,searchVo);
}
/**
......@@ -308,6 +383,12 @@ public class TDispatchInfoController {
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportSocialRecordRoster')")
public void doexportSocialRecordRoster(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
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.setCreateBy(user.getId());
tDispatchInfoService.doexportSocialRecordRoster(response,searchVo,searchVo.getIdStr(),null);
}
......@@ -324,11 +405,13 @@ public class TDispatchInfoController {
@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
public void doexportFundRecordChange(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) {
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
tDispatchInfoService.doexportFundRecordChange(response, searchVo.getIdStr(),searchVo,settleDomains,sql);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
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.setCreateBy(user.getId());
tDispatchInfoService.doexportFundRecordChange(response, searchVo.getIdStr(),searchVo);
}
/**
* @Author fxj
......
......@@ -19,10 +19,14 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
......@@ -52,6 +56,7 @@ public class TForecastLibraryController {
private final TForecastLibraryService tForecastLibraryService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -63,6 +68,11 @@ public class TForecastLibraryController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TForecastLibrary>> getTForecastLibraryPage(Page<TForecastLibrary> page, TForecastLibrary tForecastLibrary) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tForecastLibrary);
if (Common.isNotNull(tForecastLibrary.getAuthSql()) && tForecastLibrary.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tForecastLibrary.setAuthSql(tForecastLibrary.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
return new R<>(tForecastLibraryService.getTForecastLibraryPage(page, tForecastLibrary));
}
......@@ -130,6 +140,11 @@ public class TForecastLibraryController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('social_tforecastlibrary-export')")
public void export(HttpServletResponse response, @RequestBody TForecastLibrary searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
tForecastLibraryService.listExport(response, searchVo);
}
......
......@@ -21,8 +21,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
......@@ -53,6 +56,7 @@ public class TIncomeController {
private final TIncomeService tIncomeService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -64,6 +68,8 @@ public class TIncomeController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TIncome>> getTIncomePage(Page<TIncome> page, TIncomeSearchVo tIncome) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tIncome);
return new R<>(tIncomeService.getTIncomePage(page, tIncome));
}
......@@ -147,6 +153,8 @@ public class TIncomeController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('social_tincome-export')")
public void export(HttpServletResponse response, @RequestBody TIncomeSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
tIncomeService.listExport(response, searchVo);
}
......
......@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
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.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
......@@ -64,6 +65,8 @@ public class TPreDispatchInfoController {
private final TPreDispatchInfoService tPreDispatchInfoService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
* @param page 分页对象
......@@ -73,6 +76,11 @@ public class TPreDispatchInfoController {
@Operation(summary = "简单分页查询", description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TPreDispatchInfo>> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tPreDispatchInfo);
if (Common.isNotNull(tPreDispatchInfo.getAuthSql()) && tPreDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tPreDispatchInfo.setAuthSql(tPreDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID_ADD"));
}
return new R<>(tPreDispatchInfoService.getTPreDispatchInfoPage(page,tPreDispatchInfo));
}
/**
......@@ -381,6 +389,11 @@ public class TPreDispatchInfoController {
@PreAuthorize("@pms.hasPermission('social:tpredispatchinfo_doexportPreDispatch')")
public void doexportPreDispatch(HttpServletResponse response,
@RequestBody(required = false) TPreDispatchInfo preDispatchInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, preDispatchInfo);
if (Common.isNotNull(preDispatchInfo.getAuthSql()) && preDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
preDispatchInfo.setAuthSql(preDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID_ADD"));
}
tPreDispatchInfoService.doexportPreDispatch(response,preDispatchInfo);
}
}
......@@ -19,10 +19,15 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
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.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService;
......@@ -54,6 +59,8 @@ public class TSocialFundInfoController {
private final TSocialFundInfoService tSocialFundInfoService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -64,7 +71,9 @@ public class TSocialFundInfoController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TSocialFundInfo>> getTSocialFundInfoPage(Page<TSocialFundInfo> page, TSocialFundInfoSearchVo tSocialFundInfo) {
return new R<>(tSocialFundInfoService.getTSocialFundInfoPage(page,tSocialFundInfo));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tSocialFundInfo);
return new R<>(tSocialFundInfoService.getTSocialFundInfoPage(page,tSocialFundInfo));
}
/**
* 不分页查询
......@@ -113,7 +122,12 @@ public class TSocialFundInfoController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('tsocialfundinfo-export')")
public void export(HttpServletResponse response, @RequestBody TSocialFundInfoSearchVo searchVo) {
tSocialFundInfoService.listExport(response,searchVo);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tSocialFundInfoService.listExport(response,searchVo);
}
/**
......
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