Commit 6979ed08 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents 7cb0cfff f11b4cb0
...@@ -3461,6 +3461,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -3461,6 +3461,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
break; break;
} }
} }
if(isNum && shuValue.length() != 4){
errorFormat.append(attr.name()).append("_不符合年份格式;");
}
if(isNum && shuValue.length() == 4 && (Integer.parseInt(shuValue) > DateUtil.getYearOfInt(new Date()))){ if(isNum && shuValue.length() == 4 && (Integer.parseInt(shuValue) > DateUtil.getYearOfInt(new Date()))){
errorFormat.append(attr.name()).append("_不可为未来年份;"); errorFormat.append(attr.name()).append("_不可为未来年份;");
} }
......
...@@ -15,4 +15,9 @@ public interface ClientNameConstants { ...@@ -15,4 +15,9 @@ public interface ClientNameConstants {
* MVP * MVP
*/ */
String CLIENT_B = "hrCustomer"; String CLIENT_B = "hrCustomer";
/**
* csp
*/
String CLIENT_CSP = "yifu-csp";
} }
...@@ -5252,22 +5252,46 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -5252,22 +5252,46 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
**/ **/
@Override @Override
public R<Integer> listSumExportCheck(HttpServletResponse response, TPaymentInfoSearchVo searchVo){ public R<Integer> listSumExportCheck(HttpServletResponse response, TPaymentInfoSearchVo searchVo){
if (Common.isEmpty(searchVo.getEmpIdcard()) boolean flag = Common.isEmpty(searchVo.getEmpIdcard())
&& Common.isEmpty(searchVo.getSocialSecurityNo())
&& Common.isEmpty(searchVo.getUnitName()) && Common.isEmpty(searchVo.getUnitName())
&& Common.isEmpty(searchVo.getSettleDomainName()) && Common.isEmpty(searchVo.getSettleDomainName())
&& Common.isEmpty(searchVo.getSocialCreateMonth()) && Common.isEmpty(searchVo.getSocialCreateMonth())
&& Common.isEmpty(searchVo.getSocialPayMonth()) && Common.isEmpty(searchVo.getSocialPayMonth())
&& Common.isEmpty(searchVo.getSocialProvince()) && Common.isEmpty(searchVo.getSocialProvince())
&& Common.isEmpty(searchVo.getSecondIndicatorBelong())){ && Common.isEmpty(searchVo.getCreateName())
&& null == searchVo.getCreateTimeEnd()
&& Common.isEmpty(searchVo.getSecondIndicatorBelong())
&& Common.isEmpty(searchVo.getPushStatus())
&& Common.isEmpty(searchVo.getLockStatus());
// 单独处理户数据查询
if (false && Common.isEmpty(searchVo.getSocialProvince())){
// 只有社保户 // 只有社保户
if (Common.isNotNull(searchVo.getSocialHousehold())){ if (Common.isNotNull(searchVo.getSocialHousehold()) && !Common.isNotNull(searchVo.getProvidentHousehold())){
//特殊处理皖信户
if ("安徽皖信人力资源管理有限公司".equals(searchVo.getSocialHousehold())){
return R.ok(20001);
}
return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo)); return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo));
} }
//只有公积金户 //只有公积金户
if (Common.isNotNull(searchVo.getProvidentHousehold())){ if (Common.isNotNull(searchVo.getProvidentHousehold()) && !Common.isNotNull(searchVo.getSocialHousehold())){
//特殊处理皖信户
if ("安徽皖信人力资源管理有限公司".equals(searchVo.getProvidentHousehold())){
return R.ok(20001);
}
return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo)); return R.ok(baseMapper.selectCountPaymentSearchInfoSocialByLimit(searchVo));
} }
} }
// 单独处理区域数据
if (false && Common.isEmpty(searchVo.getSocialHousehold())
&& Common.isEmpty(searchVo.getProvidentHousehold())
&& !Common.isEmpty(searchVo.getSocialProvince())){
if ((Common.isEmpty(searchVo.getSocialCity()) && "12".equals(searchVo.getSocialProvince()))
||(Common.isEmpty(searchVo.getSocialTown()) && "135".equals(searchVo.getSocialProvince()))){
return R.ok(20001);
}
}
return R.ok(baseMapper.selectCountSumPaymentInfo(searchVo)); return R.ok(baseMapper.selectCountSumPaymentInfo(searchVo));
} }
/** /**
......
...@@ -37,6 +37,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper; ...@@ -37,6 +37,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper;
import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper; import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptRelationService; import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptRelationService;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptService; import com.yifu.cloud.plus.v1.yifu.admin.service.SysDeptService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; 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.util.R;
...@@ -504,8 +505,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -504,8 +505,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
} }
} }
// todo 去常量 dept.setClient(ClientNameConstants.CLIENT_CSP);
dept.setClient("yifu-csp");
this.save(dept); this.save(dept);
return R.ok("创建成功"); return R.ok("创建成功");
} }
......
...@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserDeptPermissionMapper; ...@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserDeptPermissionMapper;
import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper; import com.yifu.cloud.plus.v1.yifu.admin.mapper.SysUserMapper;
import com.yifu.cloud.plus.v1.yifu.admin.service.SysUserDeptPermissionService; import com.yifu.cloud.plus.v1.yifu.admin.service.SysUserDeptPermissionService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; 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.util.R;
...@@ -156,8 +157,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -156,8 +157,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
} }
// 更新用户数据权限 // 更新用户数据权限
// todo 去常量 sysUserDeptPermission.setClient(ClientNameConstants.CLIENT_CSP);
sysUserDeptPermission.setClient("yifu-csp");
sysUserDeptPermission.setPermissionsType(CommonConstants.TWO_STRING); sysUserDeptPermission.setPermissionsType(CommonConstants.TWO_STRING);
baseMapper.insert(sysUserDeptPermission); baseMapper.insert(sysUserDeptPermission);
redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ userInfo.getUsername()); redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ userInfo.getUsername());
...@@ -316,7 +316,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer ...@@ -316,7 +316,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
SysUserDeptPermission permission = new SysUserDeptPermission(); SysUserDeptPermission permission = new SysUserDeptPermission();
permission.setDeptId(entity.getDeptId()); permission.setDeptId(entity.getDeptId());
permission.setUserId(user.getUserId()); permission.setUserId(user.getUserId());
permission.setClient("yifu-csp"); permission.setClient(ClientNameConstants.CLIENT_CSP);
permission.setProjectName(entity.getProjectName()); permission.setProjectName(entity.getProjectName());
permission.setProjectNo(entity.getProjectNo()); permission.setProjectNo(entity.getProjectNo());
permission.setUserType(entity.getUserType()); permission.setUserType(entity.getUserType());
......
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