Skip to content

Y
yifu-mvp
Commit 7acc3567 authored by huyuchen's avatar huyuchen
Browse files
Options

社保公积金办理权限调整

parent d59103f9
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 29 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ 7acc3567
......@@ -31,11 +31,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.check.entity.TCheckBankNo;
import com.yifu.cloud.plus.v1.check.vo.CheckBankNoVo;
import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
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.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCustomerInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService;
......@@ -90,9 +88,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
@Autowired
private TSettleDomainService tSettleDomainService;
@Autowired
private TCustomerInfoMapper tCustomerInfoMapper;
@Autowired
@Lazy
private DoJointTask doJointTask;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialfundHouseRes.java
View file @ 7acc3567
......@@ -20,14 +20,12 @@ package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.List;
......@@ -123,9 +121,15 @@ public class TSocialfundHouseRes {
* 户类型 0社保户1公积金户
*/
@ExcelAttribute(name = "户类型 0社保户1公积金户", maxLength = 1)
@Length(max = 1, message = "户类型 0社保户1公积金户不能超过1个字符")
@ExcelProperty("户类型 0社保户1公积金户")
@Schema(description = "户类型 0社保户1公积金户")
private String houseNameType;
private String houseNameType; /**
* 权限类型 0审核1办理
*/
@ExcelAttribute(name = "权限类型 0审核1办理", maxLength = 1)
@ExcelProperty("权限类型 0审核1办理")
@Schema(description = "权限类型 0审核1办理")
private String authType;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoExportVo.java
View file @ 7acc3567
......@@ -17,22 +17,16 @@
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
* 缴费库导出参数
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysHouseHoldInfoController.java
View file @ 7acc3567
......@@ -21,13 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.admin.api.entity.SysUser;
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.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialfundHouseRes;
import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
......@@ -136,6 +134,7 @@ public class SysHouseHoldInfoController {
@RequestParam(required = false) String name) {
List<SysHouseHoldInfo> houseHoldList;
LambdaQueryWrapper<SysHouseHoldInfo> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SysHouseHoldInfo::getDelFlag, CommonConstants.ZERO_STRING);
if (CommonConstants.ZERO_STRING.equals(flag)) {
wrapper.eq(SysHouseHoldInfo::getType, CommonConstants.ZERO_STRING);
if (Common.isNotNull(name)) {
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialfundHouseResController.java
View file @ 7acc3567
......@@ -29,7 +29,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ 7acc3567
......@@ -459,8 +459,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
private void importTPaymentSocialInfo(List<TPaymentInfoVo> list, List<ErrorMessage> errorMessageList,
YifuUser user, Integer rowNumber) {
long start = System.currentTimeMillis();
HashMap<String, String> areaMap = new HashMap<>();
HashMap<String, String> areaMap2 = new HashMap<>();
R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
......@@ -1406,8 +1404,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
}
} else {
errorMessageList.add(new ErrorMessage(-1, "无数据可导入！"));
}
} catch (Exception e) {
log.error("数据批量导入异常：" + e);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialfundHouseResServiceImpl.java
View file @ 7acc3567
......@@ -17,8 +17,10 @@
package com.yifu.cloud.plus.v1.yifu.social.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialfundHouseRes;
......@@ -29,9 +31,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* 社保公积金户权限配置表
*
......@@ -63,6 +62,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
@Override
public R saveSocialAuth(TSocialfundHouseRes searchVo) {
LambdaQueryWrapper<TSocialfundHouseRes> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TSocialfundHouseRes::getStatus, CommonConstants.ZERO_STRING);
if (Common.isNotNull(searchVo.getSocialHousehold())) {
wrapper.eq(TSocialfundHouseRes::getSocialHousehold, searchVo.getSocialHousehold());
}
......@@ -72,9 +72,18 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
if (Common.isNotNull(searchVo.getUserId())){
wrapper.eq(TSocialfundHouseRes::getUserId,searchVo.getUserId());
}
if (Common.isNotNull(searchVo.getAuthType())){
wrapper.eq(TSocialfundHouseRes::getAuthType,searchVo.getAuthType());
}
TSocialfundHouseRes socialfundHouseRes = baseMapper.selectOne(wrapper);
if (Common.isNotNull(socialfundHouseRes)) {
return R.failed("员工已存在审核权限");
String errorMessage;
if (CommonConstants.ZERO_STRING.equals(searchVo.getAuthType())) {
errorMessage = "员工已存在审核权限";
} else {
errorMessage = "员工已存在办理权限";
}
return R.failed(errorMessage);
} else {
baseMapper.insert(searchVo);
return R.ok();
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialfundHouseResMapper.xml
View file @ 7acc3567
......@@ -34,6 +34,7 @@
<result property="userName" column="USER_NAME"/>
<result property="userDeptName" column="USER_DEPT_NAME"/>
<result property="houseNameType" column="HOUSE_NAME_TYPE"/>
<result property="authType" column="AUTH_TYPE"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -45,7 +46,8 @@
a.STATUS,
a.USER_NAME,
a.USER_DEPT_NAME,
a.HOUSE_NAME_TYPE
a.HOUSE_NAME_TYPE,
a.AUTH_TYPE
</sql>
<sql id="tSocialfundHouseRes_where">
<if test="tSocialfundHouseRes != null">
......@@ -75,6 +77,9 @@
<if test="tSocialfundHouseRes.houseNameType != null and tSocialfundHouseRes.houseNameType.trim() != ''">
AND a.HOUSE_NAME_TYPE = #{tSocialfundHouseRes.houseNameType}
</if>
<if test="tSocialfundHouseRes.authType != null and tSocialfundHouseRes.authType.trim() != ''">
AND a.AUTH_TYPE = #{tSocialfundHouseRes.authType}
</if>
</if>
</if>
</sql>
......
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