Skip to content

Y
yifu-mvp
Commit 168a798a authored by hongguangwu's avatar hongguangwu
Browse files
Options

结算主体换成-项目

parent 7b9e12ff
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 185 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractAttachInfo.java
View file @ 168a798a
......@@ -176,7 +176,7 @@ public class FddContractAttachInfo extends BaseEntity {
private String empPhone;
/**
* 结算主体编码
* 项目编码
*/
@Schema(description ="项目编码")
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 20, needExport = true)
......@@ -190,10 +190,10 @@ public class FddContractAttachInfo extends BaseEntity {
private String empNatrue;
/**
* 结算主体名称
* 项目名称
*/
@TableField(exist = false)
@Schema(name = "结算主体名称")
@Schema(name = "项目名称")
private String departName;
/**
* 客户名称
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TCutsomerDataPermisson.java
View file @ 168a798a
......@@ -57,11 +57,11 @@ public class TCutsomerDataPermisson extends Model<TCutsomerDataPermisson> {
@Schema(description = "合同主体id", name = "contractId")
private String contractId;
/**
* 结算主体id
* 项目id
*/
@Length(max = 32, message = "结算主体id不能超过32个字符")
@ExcelAttribute(name = "结算主体id", maxLength = 32)
@Schema(description = "结算主体id", name = "settleDomainId")
@Length(max = 32, message = "项目id不能超过32个字符")
@ExcelAttribute(name = "项目id", maxLength = 32)
@Schema(description = "项目id", name = "settleDomainId")
private String settleDomainId;
/**
* 授权来源
......@@ -112,7 +112,7 @@ public class TCutsomerDataPermisson extends Model<TCutsomerDataPermisson> {
@Schema(description = "是否是客服（0是1否）", name = "isCustomerService")
private String isCustomerService;
@Schema(description = "类型0:客户1:合同2:结算主体", name = "type")
@Schema(description = "类型0:客户1:合同2:项目", name = "type")
private String type;
/**
* 无参构造方法
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpChangeInfo.java
View file @ 168a798a
......@@ -63,13 +63,13 @@ public class TEmpChangeInfo extends BaseEntity {
private String newDept;
/**
* 原结算主体
* 原项目
*/
@Schema(description ="原项目名称")
private String oldSettle;
/**
* 新结算主体
* 新项目
*/
@Schema(description ="新项目名称")
private String newSettle;
......@@ -93,9 +93,9 @@ public class TEmpChangeInfo extends BaseEntity {
private String changeStartMonth;
/**
* 结算主体id
* 项目id
*/
@Schema(description ="结算主体id")
@Schema(description ="项目id")
@TableField(exist = false)
private String departId;
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @ 168a798a
......@@ -229,12 +229,12 @@ public class TEmployeeContractInfo extends BaseEntity {
private String fileCabinetNo;
/**
* 结算主体
* 项目
*/
@NotBlank(message = "结算主体不能为空")
@Length(max = 32, message = "结算主体不能超过32个字符")
@ExcelAttribute(name = "结算主体", errorInfo = "结算主体不能为空", isOrgan = true, maxLength = 32)
@Schema(description = "结算主体", name = "settleDomain")
@NotBlank(message = "项目不能为空")
@Length(max = 32, message = "项目不能超过32个字符")
@ExcelAttribute(name = "项目", errorInfo = "项目不能为空", isOrgan = true, maxLength = 32)
@Schema(description = "项目", name = "settleDomain")
private String settleDomain;
/**
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java
View file @ 168a798a
......@@ -29,7 +29,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 结算主体表
* 项目表
*
* @author hgw
* @date 2022-06-20 10:02:28
......@@ -37,7 +37,7 @@ import java.time.LocalDateTime;
@Data
@TableName("t_settle_domain")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "结算主体表")
@Schema(description = "项目表")
public class TSettleDomain extends BaseEntity {
/**
......@@ -48,15 +48,15 @@ public class TSettleDomain extends BaseEntity {
private String id;
/**
* 结算主体编码
* 项目编码
*/
@Schema(description = "结算主体编码")
@Schema(description = "项目编码")
private String departNo;
/**
* 结算主体名称
* 项目名称
*/
@Schema(description = "结算主体名称")
@Schema(description = "项目名称")
private String departName;
/**
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
View file @ 168a798a
......@@ -25,15 +25,15 @@ public class ProjectSetInfoVo implements Serializable {
private String id;
/**
* 结算主体编码
* 项目编码
*/
@Schema(description = "结算主体编码")
@Schema(description = "项目编码")
private String departNo;
/**
* 结算主体名称
* 项目名称
*/
@Schema(description = "结算主体名称")
@Schema(description = "项目名称")
private String departName;
/**
......
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TCutsomerDataPermissonVo.java
View file @ 168a798a
......@@ -15,7 +15,7 @@ import lombok.Data;
@AllArgsConstructor
@Schema(description = "客户数据权限表")
public class TCutsomerDataPermissonVo extends TCutsomerDataPermisson {
@Schema(description = "客户、合同、结算主体名", name = "name")
@Schema(description = "客户、合同、项目名", name = "name")
private String name;
@Schema(description = "授权人姓名", name = "name")
private String permissionUserName;
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCutsomerDataPermissonController.java
View file @ 168a798a
......@@ -50,12 +50,12 @@ public class TCutsomerDataPermissonController {
}
/**
* @Author fxj
* @Description 获取实体的权限: type-类型0:客户1:合同2:结算主体(不传默认2结算主体)
* @Description 获取实体的权限: type-类型0:客户1:合同2:项目(不传默认2项目)
* @Date 15:20 2022/7/13
* @Param
* @return
**/
@Operation(description = "获取实体的权限: type-类型0:客户1:合同2:结算主体(不传默认2结算主体)")
@Operation(description = "获取实体的权限: type-类型0:客户1:合同2:项目(不传默认2项目)")
@GetMapping("/getPermissonByTypeAndId")
public R<IPage<TCutsomerDataPermisson>> getTCutsomerDataPermissonByTypeAndId(String id, String type) {
if(Common.isEmpty(id)){
......@@ -75,12 +75,12 @@ public class TCutsomerDataPermissonController {
/**
* @Author fxj
* @Description 获取实体的权限: type-类型0:客户1:合同2:结算主体(不传默认2结算主体)
* @Description 获取实体的权限: type-类型0:客户1:合同2:项目(不传默认2项目)
* @Date 15:21 2022/7/13
* @Param
* @return
**/
@Operation(description = "权限复制 权限同结算主体分配客服（wxhr:tsettledomain_assign_customerservice）")
@Operation(description = "权限复制 权限同项目分配客服（wxhr:tsettledomain_assign_customerservice）")
@GetMapping("/copy")
@PreAuthorize("@pms.hasPermission('wxhr:tsettledomain_assign_customerservice')")
public R insertForCopyCutsomerDataPermisson(String[] srcUser, String[] beUser) {
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @ 168a798a
......@@ -137,7 +137,7 @@ public class TEmployeeInfoController {
sql = sql.replace("#create_by", user.getId());
}
if (sql.contains("#settleDomainId")) {
// TODO - 获取人员结算主体权限
// TODO - 获取人员项目权限
// sql = sql.replace("#settleDomainId", ",'1','2' ")
sql = sql.replace("or a.settle_domain_id in ('0'#settleDomainId) ", "");
}
......@@ -214,7 +214,7 @@ public class TEmployeeInfoController {
sql = sql.replace("#create_by", user.getId());
}
if (sql.contains("#settleDomainId")) {
// TODO - 获取人员结算主体权限
// TODO - 获取人员项目权限
// sql = sql.replace("#settleDomainId", ",'1','2' ")
sql = sql.replace("or a.settle_domain_id in ('0'#settleDomainId) ", "");
}
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @ 168a798a
......@@ -38,7 +38,7 @@ import java.util.List;
/**
* 结算主体表
* 项目表
*
* @author hgw
* @date 2022-06-20 10:02:28
......@@ -46,7 +46,7 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping("/tsettledomain")
@Tag(name = "结算主体表管理")
@Tag(name = "项目表管理")
public class TSettleDomainController {
private final TSettleDomainService tSettleDomainService;
......@@ -55,7 +55,7 @@ public class TSettleDomainController {
* 分页查询
*
* @param page 分页对象
* @param tSettleDomain 结算主体表
* @param tSettleDomain 项目表
* @return
*/
@Operation(summary = "分页查询", description = "分页查询")
......@@ -67,7 +67,7 @@ public class TSettleDomainController {
/**
* 通过id查询结算主体表
* 通过id查询项目表
*
* @param id id
* @return R
......@@ -80,13 +80,13 @@ public class TSettleDomainController {
}
/**
* 新增结算主体表
* 新增项目表
*
* @param tSettleDomain 结算主体表
* @param tSettleDomain 项目表
* @return R
*/
@Operation(summary = "新增结算主体表", description = "新增结算主体表")
@SysLog("新增结算主体表")
@Operation(summary = "新增项目表", description = "新增项目表")
@SysLog("新增项目表")
@PostMapping
@PreAuthorize("@pms.hasPermission('demo_tsettledomain_add')")
public R<Boolean> save(@RequestBody TSettleDomain tSettleDomain) {
......@@ -94,13 +94,13 @@ public class TSettleDomainController {
}
/**
* 修改结算主体表
* 修改项目表
*
* @param tSettleDomain 结算主体表
* @param tSettleDomain 项目表
* @return R
*/
@Operation(summary = "修改结算主体表", description = "修改结算主体表")
@SysLog("修改结算主体表")
@Operation(summary = "修改项目表", description = "修改项目表")
@SysLog("修改项目表")
@PutMapping
@PreAuthorize("@pms.hasPermission('demo_tsettledomain_edit')")
public R<Boolean> updateById(@RequestBody TSettleDomain tSettleDomain) {
......@@ -108,13 +108,13 @@ public class TSettleDomainController {
}
/**
* 通过id删除结算主体表
* 通过id删除项目表
*
* @param id id
* @return R
*/
@Operation(summary = "通过id删除结算主体表", description = "通过id删除结算主体表")
@SysLog("通过id删除结算主体表")
@Operation(summary = "通过id删除项目表", description = "通过id删除项目表")
@SysLog("通过id删除项目表")
@DeleteMapping("/{id}")
@PreAuthorize("@pms.hasPermission('demo_tsettledomain_del')")
public R<Boolean> removeById(@PathVariable String id) {
......@@ -122,14 +122,14 @@ public class TSettleDomainController {
}
/**
* 获取登录用户拥有的结算主体信息及单位部分信息
* 获取登录用户拥有的项目信息及单位部分信息
*
* @param
* @return
* @Author fxj
* @Date 2019-08-28
**/
@Operation(description = "获取登录用户拥有的结算主体数据）")
@Operation(description = "获取登录用户拥有的项目数据）")
@Inner
@GetMapping("/getSettleDomainIdsByUserId")
public List<String> getSettleDomainIdsByUserId() {
......@@ -144,7 +144,7 @@ public class TSettleDomainController {
* @param
* @Author: wangan
* @Date: 2019/10/18
* @Description:通过id获取结算主体及单位部分信息
* @Description:通过id获取项目及单位部分信息
**/
@Inner
@PostMapping("/getSettleDomainSelectVoById")
......@@ -156,7 +156,7 @@ public class TSettleDomainController {
* @param
* @Author: wangan
* @Date: 2019/10/18
* @Description:获取所有客户单位的结算主体信息
* @Description:获取所有客户单位的项目信息
**/
@Inner
@PostMapping("/selectAllSettleDomainSelectVos")
......@@ -169,13 +169,13 @@ public class TSettleDomainController {
/**
* @Author fxj
* @Description 通过结算主体编码获取结算主体及客户信息
* @Description 通过项目编码获取项目及客户信息
* @Date 10:49 2022/7/20
* @Param
* @return
**/
@Operation(description = "通过结算主体编码获取结算主体及客户信息")
@SysLog("通过结算主体编码获取结算主体及客户信息")
@Operation(description = "通过项目编码获取项目及客户信息")
@SysLog("通过项目编码获取项目及客户信息")
@Inner
@PostMapping("/getSetInfoByCodes")
public SetInfoVo getSetInfoByCodes(@RequestBody(required = true) List<String> codes) {
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TCutsomerDataPermissonMapper.java
View file @ 168a798a
......@@ -36,7 +36,7 @@ public interface TCutsomerDataPermissonMapper extends BaseMapper<TCutsomerDataPe
String getOwnerIdByIdAndType(@Param("domainId")String domainId, @Param("type")int type);
/**
* 获取当前登录人拥有的所有结算主体权限
* 获取当前登录人拥有的所有项目权限
* @Author fxj
* @Date 2019-08-26
* @param userId
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
View file @ 168a798a
......@@ -27,7 +27,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 结算主体表
* 项目表
*
* @author hgw
* @date 2022-06-20 10:02:28
......@@ -39,12 +39,12 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
* @param id
* @Author: wangan
* @Date: 2019/10/18
* @Description: 通过id获取结算主体及单位部分信息
* @Description: 通过id获取项目及单位部分信息
**/
TSettleDomainSelectVo selectSettleDomainSelectVosById(@Param("id") String id);
/**
* 获取所有客户单位的结算主体信息
* 获取所有客户单位的项目信息
* @Author fxj
* @Date 2019-12-24
* @param
......@@ -53,7 +53,7 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
List<TSettleDomainSelectVo> selectAllSettleDomainSelectVos();
/**
* @Author fxj
* @Description 通过项目编码获取客户单位的结算主体信息
* @Description 通过项目编码获取客户单位的项目信息
* @Date 11:08 2022/7/20
* @Param
* @return
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TCutsomerDataPermissonService.java
View file @ 168a798a
......@@ -42,7 +42,7 @@ public interface TCutsomerDataPermissonService extends IService<TCutsomerDataPer
YifuUser findOwnerByIdAndType(String domainId, int type);
// /**
// * 获取当前登录人拥有的所有结算主体权限
// * 获取当前登录人拥有的所有项目权限
// * @Author fxj
// * @Date 2019-08-26
// * @param userId
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @ 168a798a
......@@ -28,14 +28,14 @@ import java.util.List;
import java.util.Map;
/**
* 结算主体表
* 项目表
*
* @author hgw
* @date 2022-06-20 10:02:28
*/
public interface TSettleDomainService extends IService<TSettleDomain> {
/**
* 清除userId的结算主体权限缓存
* 清除userId的项目权限缓存
*
* @param user
* @return
......@@ -49,7 +49,7 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
SetInfoVo getSetInfoByCodes(List<String> codes);
/**
* 通过id获取结算主体及单位部分信息
* 通过id获取项目及单位部分信息
* @param
* @return
* @Author fxj
......@@ -58,7 +58,7 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo);
/**
* 获取所有客户单位的结算主体信息
* 获取所有客户单位的项目信息
* @param
* @return
* @Author fxj
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddContractAttachInfoServiceImpl.java
View file @ 168a798a
......@@ -230,7 +230,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
TEmployeeInfo tEmployeeInfo = employeeInfoService.getOne(Wrappers.<TEmployeeInfo>query().lambda().eq(TEmployeeInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
.eq(TEmployeeInfo::getEmpIdcard, fddContractAttachInfo.getEmpIdcard()));
//该人员该结算主体有项目档案
//该人员该项目有项目档案
if (null != tEmployeeProject) {
//如果是减项状态就复项
TEmployeeProject tEmployeeProjectCompare = employeeProjectMapper.selectById(tEmployeeProject.getId());
......@@ -388,7 +388,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
errorList.add(new ErrorMessage(i, "计件工资不能为空", CommonConstants.RED));
continue;
}
//结算主体编码是否准确
//项目编码是否准确
TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDepartNo, attachInfo.getDepartNo())
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING).eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING));
if (Common.isEmpty(settleDomain)) {
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddContractInfoServiceImpl.java
View file @ 168a798a
......@@ -135,7 +135,7 @@ public class FddContractInfoServiceImpl extends ServiceImpl<FddContractInfoMappe
//法大大合同模板
TSettleDomain settleDomain = tSettleDomainService.getOne(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDepartNo, fddContractAttachInfo.getDepartNo()));
if (settleDomain == null) {
return R.failed("未获取到对应的结算主体");
return R.failed("未获取到对应的项目");
}
List<FddContractTemplate> fddContractTemplateList = fddContractTemplateService.list(Wrappers.<FddContractTemplate>query().lambda()
.eq(FddContractTemplate::getModifyUploadStatus, CommonConstants.dingleDigitStrArray[1])
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @ 168a798a
......@@ -71,7 +71,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
@Override
public R changeEmpProArc(TEmpChangeInfo tEmpChangeInfo) {
//待划转员工已在目标结算主体下不可划转
//待划转员工已在目标项目下不可划转
TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpIdcard, tEmpChangeInfo.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,tEmpChangeInfo.getDeptNo())
.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
......@@ -157,7 +157,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
errorMsg.add(MsgUtils.getMessage(ErrorCodes.PROJECT_SEARCH_NOT_EXIST, excel.getNewSettleCode()));
}
//待划转员工已在目标结算主体下不可划转
//待划转员工已在目标项目下不可划转
TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,excel.getNewSettleCode())
.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL)
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @ 168a798a
......@@ -39,7 +39,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
* 结算主体表
* 项目表
*
* @author hgw
* @date 2022-06-20 10:02:28
......@@ -53,7 +53,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
private final TCutsomerDataPermissonMapper permissonMapper;
/**
* @Author fxj
* @Description 清除结算主体缓存
* @Description 清除项目缓存
* @Date 17:08 2022/7/11
* @Param
* @return
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCutsomerDataPermissonMapper.xml
View file @ 168a798a
......@@ -119,7 +119,7 @@
ORDER BY BE_PERMISSION_TIME ASC
limit 1
</select>
<!-- 获取当前登录人拥有的所有结算主体权限 -->
<!-- 获取当前登录人拥有的所有项目权限 -->
<select id="selectAllSettleDomainPermissionByUserId" resultMap="tCutsomerDataPermissonMap">
SELECT
<include refid="base_column_list"/>
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @ 168a798a
......@@ -703,7 +703,7 @@
) c on a.ID=c.EMP_ID
left join
(
<!-- 取值未删除，审核通过，使用中，未作废的合同数据，按结算主体分组，有数据即可不要求最新 -->
<!-- 取值未删除，审核通过，使用中，未作废的合同数据，按项目分组，有数据即可不要求最新 -->
SELECT
x.SETTLE_DOMAIN,
x.CONTRACT_NAME,
......
yifu-auth/src/main/java/com/yifu.cloud.plus.v1/yifu/auth/handler/YifuClientLoginSuccessHandler.java
View file @ 168a798a
......@@ -109,10 +109,10 @@ public class YifuClientLoginSuccessHandler implements AuthenticationSuccessHandl
}
throw new InvalidException("该机构没有\""+ clientId +"\"服务权限！请联系管理员开通！");
}*/
//非管理员获取 b端结算主体权限
//非管理员获取 b端项目权限
/*if(ServiceNameConstants.CLIENT_ID_HR_B.equals(clientId) && !SecurityUtils.isHaveAllOrg(clientId,user)){
if(Common.isEmpty(user.getSettleIdList())){
throw new InvalidException("该用户("+user.getNickName()+")没有结算主体权限！请联系管理员开通！");
throw new InvalidException("该用户("+user.getNickName()+")没有项目权限！请联系管理员开通！");
}
}*/
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CacheConstants.java
View file @ 168a798a
......@@ -101,7 +101,7 @@ public interface CacheConstants {
*/
String AREA_VALUE = "area_value:";
/**
* 用户登录的结算主体vo缓存
* 用户登录的项目vo缓存
*/
public static final String WXHR_SETTLE_DOMAIN_VOS_BY_USERID = ServiceNameConstants.ARCHIVES_SERVICE + "_SettleDomainVosByUserId";
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttribute.java
View file @ 168a798a
......@@ -180,7 +180,7 @@ public @interface ExcelAttribute {
*/
public abstract boolean isDataId() default false;
/**
* 是否为客户单位和结算主体实体ID 导入要从字典表取数据 导出要对应导出中文数据
* 是否为客户单位和项目实体ID 导入要从字典表取数据 导出要对应导出中文数据
* @return
*/
public abstract boolean isOrgan() default false;
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
View file @ 168a798a
......@@ -297,7 +297,7 @@ public class ExcelUtil <T> implements Serializable {
}
if (StringUtils.isEmpty(tempStr) && (attr.isArea() || attr.isDataId())) {
if (attr.isOrgan()) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, "未找到:" + c + "的单位或结算主体数据，请确认存在结算主体权限"), errorTemp);
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, "未找到:" + c + "的单位或项目数据，请确认存在项目权限"), errorTemp);
}
if (attr.isArea()) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(rowNum, "未找到:" + c + "的区域数据"), errorTemp);
......@@ -852,8 +852,8 @@ public class ExcelUtil <T> implements Serializable {
}
if (!StringUtils.isNotBlank(tempStr)) {
if (attr.isOrgan()) {
errorList.add(new ErrorMessage(i + 2, "未找到:" + c + "的单位或结算主体数据，请确认存在结算主体权限"));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的单位或结算主体数据，请确认存在结算主体权限"), errorTemp);
errorList.add(new ErrorMessage(i + 2, "未找到:" + c + "的单位或项目数据，请确认存在项目权限"));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, "未找到:" + c + "的单位或项目数据，请确认存在项目权限"), errorTemp);
}
if (attr.isArea()) {
errorList.add(new ErrorMessage(i + 2, "未找到:" + c + "的区域数据"));
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @ 168a798a
......@@ -60,7 +60,7 @@ public class ArchivesDaprUtil {
}
/**
* @Author fxj
* @Description 通过结算主体编码获取结算主体及客户信息
* @Description 通过项目编码获取项目及客户信息
* @Date 21:18 2022/7/20
* @Param
* @return
......@@ -92,7 +92,7 @@ public class ArchivesDaprUtil {
/**
* @Author fxj
* @Description 获取所有客户单位的结算主体信息
* @Description 获取所有客户单位的项目信息
* @Date 21:18 2022/7/18
* @Param
* @return
......@@ -100,7 +100,7 @@ public class ArchivesDaprUtil {
public R<TSettleDomainListVo> selectAllSettleDomainSelectVos(){
R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/selectAllSettleDomainSelectVos","", TSettleDomainListVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取所有客户单位的结算主体信息失败！");
return R.failed("获取所有客户单位的项目信息失败！");
}
return res;
}
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @ 168a798a
......@@ -85,9 +85,9 @@ public class InsurancesConstants {
*/
public static final String DEPT_NO_IS_NOT_EXIST = "项目编码不存在";
/**
* 未找到结算主体的结算方式
* 未找到项目的结算方式
*/
public static final String PROJECT_NOT_FIND_SETTLE_TYPE = "未找到结算主体的结算方式";
public static final String PROJECT_NOT_FIND_SETTLE_TYPE = "未找到项目的结算方式";
/**
* 替换员工投保记录已存在
*/
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @ 168a798a
......@@ -167,12 +167,12 @@ public class TDispatchInfo extends BaseEntity {
@ExcelProperty("流程实例ID" )
private String processInstId;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "结算主体 不能超过32个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目 不能超过32个字符" )
@ExcelAttribute(name = "项目", maxLength = 32)
@Schema(description = "项目" )
@ExcelProperty("项目" )
private String settleDomain;
/**
......@@ -493,21 +493,21 @@ public class TDispatchInfo extends BaseEntity {
@ExcelProperty("派单项：如 养老、公积金" )
private String dispatchItem;
/**
* 结算主体名称
* 项目名称
*/
@Length(max = 50, message = "结算主体名称 不能超过50个字符" )
@ExcelAttribute(name = "结算主体名称", maxLength = 50)
@Schema(description = "结算主体名称" )
@ExcelProperty("结算主体名称" )
@Length(max = 50, message = "项目名称 不能超过50个字符" )
@ExcelAttribute(name = "项目名称", maxLength = 50)
@Schema(description = "项目名称" )
@ExcelProperty("项目名称" )
private String settleDomainName;
/**
* 结算主体编码
* 项目编码
*/
@Length(max = 50, message = "结算主体编码 不能超过50个字符" )
@ExcelAttribute(name = "结算主体编码", maxLength = 50)
@Schema(description = "结算主体编码" )
@ExcelProperty("结算主体编码" )
@Length(max = 50, message = "项目编码 不能超过50个字符" )
@ExcelAttribute(name = "项目编码", maxLength = 50)
@Schema(description = "项目编码" )
@ExcelProperty("项目编码" )
private String settleDomainCode;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @ 168a798a
......@@ -476,9 +476,9 @@ public class TPreDispatchInfo extends BaseEntity {
private String unitIdAdd;
/**
* 所属结算主体ID
* 所属项目ID
*/
@Schema(description ="所属结算主体ID")
@Schema(description ="所属项目ID")
private String departIdAdd;
/**
......@@ -488,9 +488,9 @@ public class TPreDispatchInfo extends BaseEntity {
private String unitNameAdd;
/**
* 所属结算主体名称
* 所属项目名称
*/
@Schema(description ="所属结算主体名称")
@Schema(description ="所属项目名称")
private String departNameAdd;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TProvidentFund.java
View file @ 168a798a
......@@ -184,12 +184,12 @@ public class TProvidentFund extends BaseEntity {
@ExcelProperty("员工身份证" )
private String empIdcard;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "结算主体 不能超过32个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目 不能超过32个字符" )
@ExcelAttribute(name = "项目", maxLength = 32)
@Schema(description = "项目" )
@ExcelProperty("项目" )
private String settleDomain;
/**
* 缴纳地-省
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 168a798a
......@@ -90,7 +90,7 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("员工类型" )
private String empType;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "项目id 不能超过32个字符" )
@ExcelAttribute(name = "项目id", maxLength = 32)
......@@ -98,7 +98,7 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("项目id" )
private String settleDomain;
/**
* 结算主体
* 项目
*/
@Length(max = 50, message = "社保项目名称不能超过50个字符" )
@ExcelAttribute(name = "社保项目名称", maxLength = 50)
......@@ -107,7 +107,7 @@ public class TSocialFundInfo extends BaseEntity {
private String settleDomainName;
/**
* 结算主体编码
* 项目编码
*/
@Length(max = 50, message = "社保项目编码不能超过50个字符" )
@ExcelAttribute(name = "社保项目编码", maxLength = 50)
......@@ -131,14 +131,14 @@ public class TSocialFundInfo extends BaseEntity {
private String unitId;
/**
* 结算主体-公积金
* 项目-公积金
*/
@ExcelAttribute(name = "公积金项目id", maxLength = 32)
@Schema(description = "公积金项目id" )
@ExcelProperty("公积金项目id" )
private String settleDomainFund;
/**
* 结算主体-公积金
* 项目-公积金
*/
@ExcelAttribute(name = "公积金项目名称", maxLength = 50)
@Schema(description = "公积金项目名称" )
......@@ -146,7 +146,7 @@ public class TSocialFundInfo extends BaseEntity {
private String settleDomainNameFund;
/**
* 结算主体编码-公积金
* 项目编码-公积金
*/
@ExcelAttribute(name = "公积金项目编码", maxLength = 50)
@Schema(description = "公积金项目编码" )
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @ 168a798a
......@@ -274,12 +274,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("原ID（数据迁移）" )
private Integer oldId;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "结算主体 不能超过32个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目 不能超过32个字符" )
@ExcelAttribute(name = "项目", maxLength = 32)
@Schema(description = "项目" )
@ExcelProperty("项目" )
private String settleDomain;
/**
* 缴纳地-省
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/FundHandleExportVo.java
View file @ 168a798a
......@@ -51,7 +51,7 @@ public class FundHandleExportVo implements Serializable {
* 项目名称
*/
@ExcelAttribute(name = "项目名称", isNotEmpty = true,needExport = true)
@Schema(description = "项目名称（结算主体）")
@Schema(description = "项目名称（项目）")
@ExcelProperty("项目名称" )
private String settleDomain;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @ 168a798a
......@@ -118,7 +118,7 @@ public class SocialHandleExportVo implements Serializable {
* 项目名称
*/
@ExcelAttribute(name = "项目名称", isNotEmpty = true,needExport = true)
@Schema(description = "项目名称（结算主体）")
@Schema(description = "项目名称（项目）")
@ExcelProperty("项目名称" )
private String settleDomain;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @ 168a798a
......@@ -403,16 +403,16 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
private String trustRemark;
/**
* 结算主体ID
* 项目ID
*/
@Schema(description = "结算主体ID")
@Schema(description = "项目ID")
@ExcelIgnore
private String settleDomainId;
/**
* 结算主体名称
* 项目名称
*/
@Schema(description = "结算主体名称")
@Schema(description = "项目名称")
@ExcelIgnore
private String departName;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoVo.java
View file @ 168a798a
......@@ -153,12 +153,12 @@ public class TDispatchInfoVo extends RowIndex implements Serializable {
@ExcelProperty("流程实例ID" )
private String processInstId;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "结算主体 不能超过32 个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目 不能超过32 个字符" )
@ExcelAttribute(name = "项目", maxLength = 32)
@Schema(description = "项目" )
@ExcelProperty("项目" )
private String settleDomain;
/**
* 0未删除1删除
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java
View file @ 168a798a
......@@ -433,10 +433,10 @@ public class TPreDispatchExportVo implements Serializable {
@ExcelAttribute(name = "所属单位名称", needExport = true)
private String unitNameAdd;
/**
* 所属结算主体名称
* 所属项目名称
*/
@ExcelProperty(value ="所属结算主体名称")
@ExcelAttribute(name = "所属结算主体名称", needExport = true)
@ExcelProperty(value ="所属项目名称")
@ExcelAttribute(name = "所属项目名称", needExport = true)
private String departNameAdd;
/**
* 备案基数
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
View file @ 168a798a
......@@ -420,10 +420,10 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
@ExcelAttribute(name = "所属单位ID", maxLength = 32)
private String unitIdAdd;
/**
* 所属结算主体ID
* 所属项目ID
*/
@Length(max = 32, message = "所属结算主体ID不能超过32个字符")
@ExcelAttribute(name = "所属结算主体ID", maxLength = 32)
@Length(max = 32, message = "所属项目ID不能超过32个字符")
@ExcelAttribute(name = "所属项目ID", maxLength = 32)
private String departIdAdd;
/**
* 所属单位名称
......@@ -432,10 +432,10 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
@ExcelAttribute(name = "所属单位名称", maxLength = 50)
private String unitNameAdd;
/**
* 所属结算主体名称
* 所属项目名称
*/
@Length(max = 50, message = "所属结算主体名称不能超过50个字符")
@ExcelAttribute(name = "所属结算主体名称", maxLength = 50)
@Length(max = 50, message = "所属项目名称不能超过50个字符")
@ExcelAttribute(name = "所属项目名称", maxLength = 50)
private String departNameAdd;
/**
* 社保户
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TProvidentFundVo.java
View file @ 168a798a
......@@ -172,12 +172,12 @@ public class TProvidentFundVo extends RowIndex implements Serializable {
@ExcelProperty("员工身份证" )
private String empIdcard;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "结算主体 不能超过32 个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目 不能超过32 个字符" )
@ExcelAttribute(name = "项目", maxLength = 32)
@Schema(description = "项目" )
@ExcelProperty("项目" )
private String settleDomain;
/**
* 缴纳地-省
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
View file @ 168a798a
......@@ -50,7 +50,7 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号")
private String empIdcard;
@ExcelAttribute(name = "缴纳类型", isNotEmpty = true, errorInfo = "缴纳类型必填", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
@ExcelProperty("缴纳类型")
private String paymentType;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialInfoVo.java
View file @ 168a798a
......@@ -269,12 +269,12 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
@ExcelProperty("原ID（数据迁移）" )
private Integer oldId;
/**
* 结算主体
* 项目
*/
@Length(max = 32, message = "结算主体 不能超过32 个字符" )
@ExcelAttribute(name = "结算主体", maxLength = 32)
@Schema(description = "结算主体" )
@ExcelProperty("结算主体" )
@Length(max = 32, message = "项目 不能超过32 个字符" )
@ExcelAttribute(name = "项目", maxLength = 32)
@Schema(description = "项目" )
@ExcelProperty("项目" )
private String settleDomain;
/**
* 缴纳地-省
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 168a798a
......@@ -126,7 +126,7 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--社保办理列表")
@GetMapping("/pageSocialHandle")
public R<IPage<TDispatchInfo>> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
// 获取结算主体权限 TODO
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
......@@ -142,7 +142,7 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--公积金办理列表")
@GetMapping("/pageFundHandle")
public R<IPage<TDispatchInfo>> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
// 获取结算主体权限 TODO
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
......@@ -325,7 +325,7 @@ public class TDispatchInfoController {
public void doexportFundRecordChange(HttpServletResponse response, HttpServletRequest request,
@RequestParam(name = "idStr", required = false) String idStr,
@RequestBody String[] exportFields, SocialHandleSearchVo searchVo) {
// 获取结算主体权限 TODO
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
......@@ -345,7 +345,7 @@ public class TDispatchInfoController {
public R<List<FundSupplementaryExportVo>> doExportFundSupplementaryRecord(HttpServletResponse response, HttpServletRequest request,
@RequestParam(name = "idStr", required = false) String idStr,
@RequestBody SocialHandleSearchVo searchVo) {
// 获取结算主体权限 TODO
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @ 168a798a
......@@ -185,7 +185,7 @@ public class TPaymentInfoController {
/**
* 删除当前登录人当前月的社保或公积金数据
* @param type 0 全部删除 1 删除社保 2 删除公积金 必填
* @param settleDepartId 结算主体ID 可选
* @param settleDepartId 项目ID 可选
* @param unitId 单位ID 可选
* @param empIdCard 员工身份证 可选
* @param socialHouseId 社保户 可选
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @ 168a798a
......@@ -219,7 +219,7 @@ public class TPreDispatchInfoController {
* @Date 2022-07-18
* @param jsonString
* @param socialHouse 社保户
* @param departId 结算主体ID
* @param departId 项目ID
* @return
**/
@Operation(summary = "预派单批量新增派增", description = "预派单批量新增派增")
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 168a798a
......@@ -292,7 +292,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Map<String, DispatchEmpVo> empVoMap = getDispatchEmpVo(idcards, codes);
// 通过身份证查询社保&公积金&社保公积金查询信息: 身份证维度唯一
Map<String, TSocialFundInfo> socialFundMap = getSocialFundMap(idcards);
// 获取结算主体编码数据 以供校验
// 获取项目编码数据 以供校验
Map<String, ProjectSetInfoVo> projectVoMap = getProjectVoMap(codes);
// 获取所有社保户和公积金户数据
Map<String, SysBaseSetInfo> socialHoldMap = new HashMap<>();
......@@ -785,7 +785,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 默认待审核
dispatch.setStatus(CommonConstants.ONE_STRING);
dispatch.setDeleteFlag(CommonConstants.ZERO_STRING);
// 封装结算主体客户信息
// 封装项目客户信息
dispatch.setSettleDomainName(excel.getDepartName());
dispatch.setSettleDomain(excel.getSettleDomainId());
dispatch.setBelongUnit(excel.getCustomerId());
......@@ -2482,7 +2482,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String fileName = DispatchConstants.SOCIAL_RECORD_ROSTER_EXPORT + LocalDateTime.now() + ".xlsx";
//获取要导出的列表
List<SocialHandleExportVo> list = new ArrayList<>();
// 结算主体权限 TODO
// 项目权限 TODO
List<String> settleDomains = null;
// 自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @ 168a798a
......@@ -326,11 +326,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
List<TSettleDomainSelectVo> settleDomainR = null;
R<TSettleDomainListVo> listVo = null;
//结算主体名称map key:结算主体id value:结算主体名称
//项目名称map key:项目id value:项目名称
Map<String, String> settleDomainNameMap = new HashMap<>();
//客户名称map key:客户id value:客户名称
Map<String, String> customerNameMap = new HashMap<>();
//结算主体客户关系map key:结算主体id value:客户id
//项目客户关系map key:项目id value:客户id
Map<String, String> settleIdAndCustomerIdMap = new HashMap<>();
listVo = archivesDaprUtil.selectAllSettleDomainSelectVos();
if (Common.isNotNull(listVo)) {
......@@ -398,11 +398,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
List<TSettleDomainSelectVo> settleDomainR = null;
R<TSettleDomainListVo> listVo = null;
//结算主体名称map key:结算主体id value:结算主体名称
//项目名称map key:项目id value:项目名称
Map<String, String> settleDomainNameMap = new HashMap<>();
//客户名称map key:客户id value:客户名称
Map<String, String> customerNameMap = new HashMap<>();
//结算主体客户关系map key:结算主体id value:客户id
//项目客户关系map key:项目id value:客户id
Map<String, String> settleIdAndCustomerIdMap = new HashMap<>();
listVo = archivesDaprUtil.selectAllSettleDomainSelectVos();
if (Common.isNotNull(listVo)) {
......@@ -435,7 +435,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if (Common.isEmpty(preList)) {
return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
}
// 找出所有需要派减的社保或公积金数据 主要用于派减是获取结算主体相关数据
// 找出所有需要派减的社保或公积金数据 主要用于派减是获取项目相关数据
HashMap<String, TSocialInfo> socialMap = new HashMap<>();
HashMap<String, TProvidentFund> fundMap = new HashMap<>();
// 封装需要派减的社保或公积金信息
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @ 168a798a
......@@ -379,7 +379,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SocialConstants.EMP_NAME_ERROR));
}
} else {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "调基失败：未找到对应结算主体下的员工" + excel.getEmpName() + "数据!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "调基失败：未找到对应项目下的员工" + excel.getEmpName() + "数据!"));
}
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ 168a798a
......@@ -61,6 +61,7 @@
<result property="createBy" column="CREATE_BY"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="createName" column="CREATE_NAME"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/>
<result property="firstBuyMonthSocial" column="FIRST_BUY_MONTH_SOCIAL"/>
<result property="unitPensionCardinal" column="UNIT_PENSION_CARDINAL"/>
......@@ -257,10 +258,7 @@
<result property="trustRemark" column="TRUST_REMARK"/>
</resultMap>
<sql id="Base_Column_List">
a
.
ID
,
a.ID,
a.EMP_ID,
a.EMP_NO,
a.EMP_NAME,
......@@ -296,6 +294,7 @@
a.UPDATE_BY,
a.CREATE_NAME,
a.UPDATE_TIME,
a.CREATE_TIME,
a.FIRST_BUY_MONTH_SOCIAL,
a.UNIT_PENSION_CARDINAL,
a.UNIT_MEDICAL_CARDINAL,
......
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysDataAuth.java
View file @ 168a798a
......@@ -79,10 +79,10 @@ public class SysDataAuth extends BaseEntity {
private Integer isDeptAuth;
/**
* 结算主体权限：0否；1是
* 项目权限：0否；1是
*/
@NotNull(message = "结算主体权限：0否；1是不能为空")
@Schema(description = "结算主体权限：0否；1是", required = true)
@NotNull(message = "项目权限：0否；1是不能为空")
@Schema(description = "项目权限：0否；1是", required = true)
private Integer isSettleAuth;
/**
......
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysDataAuthMenuRel.java
View file @ 168a798a
......@@ -56,10 +56,10 @@ public class SysDataAuthMenuRel implements Serializable {
private String menuId;
/**
* 类型：1：创建人；2：结算主体；3部门
* 类型：1：创建人；2：项目；3部门
*/
@NotNull(message = "类型：1：创建人；2：结算主体；3部门不能为空")
@Schema(description = "类型：1：创建人；2：结算主体；3部门", required = true)
@NotNull(message = "类型：1：创建人；2：项目；3部门不能为空")
@Schema(description = "类型：1：创建人；2：项目；3部门", required = true)
private Integer type;
}
yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/SysDataAuthVO.java
View file @ 168a798a
......@@ -44,10 +44,10 @@ public class SysDataAuthVO implements Serializable {
List<SysDataAuthDeptRel> authDeptList;
@Schema(description = "权限-sql列表")
List<SysDataAuthDiySql> authSqlList;
// 1：创建人；2：结算主体；3部门
// 1：创建人；2：项目；3部门
@Schema(description = "菜单-创建人列表")
List<SysDataAuthMenuRel> menuCreateList;
@Schema(description = "菜单-结算主体（项目）列表")
@Schema(description = "菜单-项目（项目）列表")
List<SysDataAuthMenuRel> menuSettleList;
@Schema(description = "菜单-组织部门列表")
List<SysDataAuthMenuRel> menuDeptList;
......
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysDataAuthServiceImpl.java
View file @ 168a798a
......@@ -52,7 +52,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
// 权限-部门
private final SysDataAuthDeptRelService authDeptRelService;
// 权限-菜单（type：类型：1：创建人；2：结算主体；3部门）
// 权限-菜单（type：类型：1：创建人；2：项目；3部门）
private final SysDataAuthMenuRelService authMenuRelService;
// 权限-自定义sql
private final SysDataAuthDiySqlService diySqlService;
......@@ -93,7 +93,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
List<SysDataAuthDeptRel> authDeptList = sysDataAuthVO.getAuthDeptList();
List<SysDataAuthDiySql> authSqlList = sysDataAuthVO.getAuthSqlList();
// 类型：1：创建人；2：结算主体；3部门
// 类型：1：创建人；2：项目；3部门
List<SysDataAuthMenuRel> menuCreateList = sysDataAuthVO.getMenuCreateList();
List<SysDataAuthMenuRel> menuSettleList = sysDataAuthVO.getMenuSettleList();
List<SysDataAuthMenuRel> menuDeptList = sysDataAuthVO.getMenuDeptList();
......@@ -135,7 +135,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
}
}
// 处理结算主体
// 处理项目
if (menuSettleList != null && !menuSettleList.isEmpty()) {
nowSql = " or a.settle_domain_id in ('0'#settleDomainId) ";
sysDataAuth.setIsSettleAuth(1);
......@@ -297,7 +297,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
List<SysDataAuthDeptRel> authDeptList = sysDataAuthVO.getAuthDeptList();
List<SysDataAuthDiySql> authSqlList = sysDataAuthVO.getAuthSqlList();
// 类型：1：创建人；2：结算主体；3部门
// 类型：1：创建人；2：项目；3部门
List<SysDataAuthMenuRel> menuCreateList = sysDataAuthVO.getMenuCreateList();
List<SysDataAuthMenuRel> menuSettleList = sysDataAuthVO.getMenuSettleList();
List<SysDataAuthMenuRel> menuDeptList = sysDataAuthVO.getMenuDeptList();
......@@ -350,7 +350,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
saveMenuDeptList.addAll(menuCreateList);
}
// 处理结算主体
// 处理项目
if (menuSettleList != null && !menuSettleList.isEmpty()) {
nowSql = " or a.settle_domain_id in ('0'#settleDomainId) ";
sysDataAuth.setIsSettleAuth(1);
......
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