Skip to content

Y
yifu-mvp
Commit 736bffde authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java
#	yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
parents e238d405 efa12c41
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2829 additions and 958 deletions
k8s-bash-test/yifu-insurances-deployment.yaml 0 → 100644
View file @ 736bffde
apiVersion: apps/v1 # 指定api版本，此值必须在kubectl api-versions中
kind: Deployment # 指定创建资源的角色/类型
metadata: # 资源的元数据/属性
name: yifu-insurances # 资源的名字，在同一个namespace中必须唯一
namespace: qas-mvp # 部署在哪个namespace中
spec: # 资源规范字段
selector: # 选择器
matchLabels: # 匹配标签
app: yifu-insurances
replicas: 1 # 声明副本数目
#revisionHistoryLimit: 3 # 保留历史版本
#strategy: # 策略
# rollingUpdate: # 滚动更新
# maxSurge: 30% # 最大额外可以存在的副本数，可以为百分比，也可以为整数
# maxUnavailable: 30% # 示在更新过程中能够进入不可用状态的 Pod 的最大值，可以为百分比，也可以为整数
# type: RollingUpdate # 滚动更新策略
template: # 模版
metadata: # 模版
labels: # 设定资源的标签
app: yifu-insurances
annotations:
dapr.io/enabled: "true" #设定此参数为 true 注入Dapr sidecar到pod
dapr.io/app-id: "yifu-insurances" #应用程序唯一 ID。 用于服务发现、状态封装 和 发布/订阅 消费者ID
dapr.io/app-port: "5005" #这个参数告诉Dapr你的应用程序正在监听哪个端口。
#dapr.io/log-level: "debug" #为 Dapr sidecar设置日志级别。 允许的值是debug，info，warn，error。 默认是 info
#dapr.io/log-as-json: "false" #将此参数设置为true以JSON格式输出日志。 默认值为 false.
#dapr.io/config: file #告诉 Dapr 要使用哪个配置 CRD
dapr.io/app-protocol: "http" #告诉 Dapr 你的应用程序正在使用哪种协议。 有效选项是 http and grpc。 Default is http
#dapr.io/app-max-concurrency: "20" #限制应用程序的并发量。 有效的数值是大于 0
#dapr.io/app-ssl: "false" #告诉Dapr通过不安全的SSL连接调用应用程序。 同时适用于HTTP和gRPC。 Traffic between your app and the Dapr sidecar is encrypted with a certificate issued by a non-trusted certificate authority, which is considered insecure. 默认值为 false.
dapr.io/metrics-port: "9090" #设置 sidecar 度量服务器的端口。 默认值为 9090
#dapr.io/sidecar-cpu-limit: 2 #Dapr sidecar可以使用的最大CPU数量。 默认情况下未设置
#dapr.io/sidecar-memory-limit: "800Mi" #Dapr sidecar可以使用的最大内存量。默认情况下未设置 请参阅 https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/ 的有效值。
#dapr.io/sidecar-cpu-request: 1 #Dapr sidecar要求的 CPU 数量
#dapr.io/sidecar-memory-request #Dapr sidecar 请求的内存数量
dapr.io/http-max-request-size: "100" #增加http和grpc服务器请求正文参数的最大大小，单位为MB，以处理大文件的上传。 默认值为 4 MB
dapr.io/http-read-buffer-size: "16" #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
dapr.io/sidecar-listen-addresses: "0.0.0.0"
# 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
spec: # 资源规范字段
nodeSelector: # node 选择器
node-type: worker # node标签
containers: # 容器
- name: yifu-insurances # 容器的名字
image: hub.yifucenter.com:5500/qas-mvp/yifu-insurances-biz:1.0.0 # 容器镜像地址
imagePullPolicy: Always # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
# Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
# 已经打好镜像存在docker容器中时，使用存在不检查级别，
# 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
ports:
- containerPort: 5005 # 容器端口
env: # 启动环境配置信息 active and timeZone set
- name: SPRING_PROFILES_ACTIVE
value: test
- name: TZ
value: Asia/Shanghai
resources: #资源配置限制
limits: # 最大使用
memory: "2048Mi"
#cpu: 300m # CPU，1核心 = 1000m
requests: # 容器运行时，最低资源需求，也就是说最少需要多少资源容器才能正常运行
#cpu: 100m
memory: "500Mi"
#livenessProbe: # pod 内部健康检查的设置
# httpGet: # 通过httpget检查健康，返回200-399之间，则认为容器正常
# path: /healthCheck # URI地址
# port: 8080 # 端口
# scheme: HTTP # 协议
# # host: 127.0.0.1 # 主机地址
# initialDelaySeconds: 30 # 表明第一次检测在容器启动后多长时间后开始
# timeoutSeconds: 5 # 检测的超时时间
# periodSeconds: 30 # 检查间隔时间
# successThreshold: 1 # 成功门槛
# failureThreshold: 5 # 失败门槛，连接失败5次，pod杀掉，重启一个新的pod
# readinessProbe: # Pod 准备服务健康检查设置
# httpGet:
# path: /healthCheck
# port: 8080
# scheme: HTTP
# initialDelaySeconds: 30
# timeoutSeconds: 5
# periodSeconds: 10
# successThreshold: 1
# failureThreshold: 5
#也可以用这种方法
#exec: 执行命令的方法进行监测，如果其退出码不为0，则认为容器正常
# command:
# - cat
# - /tmp/health
#也可以用这种方法
#tcpSocket: # 通过tcpSocket检查健康
# port: number
#ports:
# - name: http # 名称
# containerPort: 8080 # 容器开发对外的端口
# protocol: TCP # 协议
imagePullSecrets: # 镜像仓库拉取密钥
- name: login
#affinity: # 亲和性调试
# nodeAffinity: # 节点亲和力
# requiredDuringSchedulingIgnoredDuringExecution: # pod 必须部署到满足条件的节点上
# nodeSelectorTerms: # 节点满足任何一个条件就可以
# - matchExpressions: # 有多个选项，则只有同时满足这些逻辑选项的节点才能运行 pod
# - key: beta.kubernetes.io/arch
# operator: In
# values:
# - amd64
\ No newline at end of file
k8s-bash-test/yifu-insurances-service.yaml 0 → 100644
View file @ 736bffde
apiVersion: v1 # 指定api版本，此值必须在kubectl api-versions中
kind: Service # 指定创建资源的角色/类型
metadata: # 资源的元数据/属性
labels: # 设定资源的标签
app: yifu-insurances # 资源的名字，在同一个namespace中必须唯一
name: yifu-insurances # 资源的名字，在同一个namespace中必须唯一
namespace: qas-mvp # 部署在哪个namespace中
spec: # 资源规范字段
ports:
- port: 5005 # service 端口
protocol: TCP # 协议
targetPort: 5005 # 容器暴露的端口
name: http-insurances # 端口名称
- port: 3500 # service 端口
protocol: TCP # 协议
targetPort: 3500 # 容器暴露的端口
name: http-insurances-dapr
selector: # 选择器
app: yifu-insurances # 资源名称
type: ClusterIP # ClusterIP 类型
\ No newline at end of file
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractAttachInfo.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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;
/**
......@@ -59,4 +59,6 @@ public class ProjectSetInfoVo implements Serializable {
*/
@Schema(description = "商险结算类型")
private String insuranceSettleType = CommonConstants.ONE_STRING;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TCutsomerDataPermissonVo.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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/TEmployeeInfoServiceImpl.java
View file @ 736bffde
......@@ -1181,7 +1181,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 户籍所在地
if (Common.isNotNull(excel.getIdProvince())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1189,7 +1189,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getIdCity())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdCity() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdCity() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1197,7 +1197,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getIdTown())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdTown() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdTown() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1206,7 +1206,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 档案所在地
if (Common.isNotNull(excel.getFileProvince())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getFileProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getFileProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1214,7 +1214,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getFileCity())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getFileCity() + CommonConstants.DOWN_LINE_STRING + excel.getFileProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getFileCity() + CommonConstants.DOWN_LINE_STRING + excel.getFileProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1222,7 +1222,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getFileTown())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getFileTown() + CommonConstants.DOWN_LINE_STRING + excel.getFileCity().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getFileTown() + CommonConstants.DOWN_LINE_STRING + excel.getFileCity().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1692,7 +1692,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 户籍所在地
if (Common.isNotNull(excel.getIdProvince())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1700,7 +1700,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getIdCity())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdCity() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdCity() + CommonConstants.DOWN_LINE_STRING + excel.getIdProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1708,7 +1708,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getIdTown())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdTown() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getIdTown() + CommonConstants.DOWN_LINE_STRING + excel.getIdCity().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1717,7 +1717,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 档案所在地
if (Common.isNotNull(excel.getFileProvince())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getFileProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getFileProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1725,7 +1725,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getFileCity())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getFileCity() + CommonConstants.DOWN_LINE_STRING + excel.getFileProvince().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getFileCity() + CommonConstants.DOWN_LINE_STRING + excel.getFileProvince().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR, excel.getEmpIdcard()));
} else {
......@@ -1733,7 +1733,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if (Common.isNotNull(excel.getFileTown())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getFileTown() + CommonConstants.DOWN_LINE_STRING + excel.getFileCity().trim());
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + excel.getFileTown() + CommonConstants.DOWN_LINE_STRING + excel.getFileCity().trim());
if (Common.isEmpty(areaStr)) {
errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_IMPORT_EMP_FILE_AREA_ERROR, excel.getEmpIdcard()));
} else {
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -707,7 +707,7 @@
) c on a.ID=c.EMP_ID
left join
(
<!-- 取值未删除，审核通过，使用中，未作废的合同数据，按结算主体分组，有数据即可不要求最新 -->
<!-- 取值未删除，审核通过，使用中，未作废的合同数据，按项目分组，有数据即可不要求最新 -->
SELECT
x.SETTLE_DOMAIN,
x.CONTRACT_NAME,
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @ 736bffde
......@@ -195,6 +195,7 @@
SELECT a.ID,
a.DEPART_NO,
a.DEPART_NAME,
a.INSURANCE_SETTLE_TYPE,
c.ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode'
......
yifu-auth/src/main/java/com/yifu.cloud.plus.v1/yifu/auth/handler/YifuClientLoginSuccessHandler.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -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/CommonConstants.java
View file @ 736bffde
......@@ -189,8 +189,8 @@ public interface CommonConstants {
/**
* 月份（阿里编码规约不允许直接使用‘魔法值’）
* @Author pwang
* @Date 2019-08-02 16:39
* @Author zhaji
* @Date 2022-07-28 16:39
**/
String[] MonthStrArray = {"0","1","2","3","4","5","6","7","8","9","10","11","12"};
......@@ -409,14 +409,14 @@ public interface CommonConstants {
String SEVEN_STRING = "7";
/**
* 工资最小不能小于零
* 工资最大不能超过9999999.99
*/
public static final String MONEY_MAX = "9999999.99";
public static final BigDecimal MONEY_MAX = new BigDecimal("9999999.99");
/**
* 工资最小不能小于零
*/
public static final String MONEY_MIN = "0";
public static final BigDecimal MONEY_MIN = new BigDecimal(0);
public static final int TWENTY_INT = 20;
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttribute.java
View file @ 736bffde
......@@ -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/constant/ValidityConstants.java
View file @ 736bffde
package com.yifu.cloud.plus.v1.yifu.common.core.constant;
import java.util.regex.Pattern;
/**
* @author fang
* 常用的一些验证，如手机、移动号码、联通号码、电信号码、密码、座机、 邮政编码、邮箱、年龄、身份证、URL、QQ、汉字、字母、数字等校验表达式
......@@ -63,4 +66,7 @@ public class ValidityConstants {
public static final String PATTERN_50 = "^.{1,50}$";
/** 最多60位 规则 */
public static final String PATTERN_60 = "^.{1,60}$";
/** 不超过两位小数的正数 */
public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$";
}
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -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/entity/TInsuranceCompany.java
View file @ 736bffde
......@@ -10,6 +10,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import org.checkerframework.common.value.qual.StringVal;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
......@@ -37,6 +38,7 @@ public class TInsuranceCompany extends BaseEntity {
*/
@NotBlank(message = "保险公司名称不能为空")
@Schema(description = "保险公司名称")
@Length(max =60,message = "保险公司名称必须小于等于60")
private String companyName;
/**
......@@ -44,6 +46,7 @@ public class TInsuranceCompany extends BaseEntity {
*/
@NotBlank(message = "保险公司地址不能为空")
@Schema(description = "保险公司地址")
@Length(max =50,message = "保险公司地址必须小于等于50")
private String companyAddress;
/**
......@@ -51,6 +54,7 @@ public class TInsuranceCompany extends BaseEntity {
*/
@NotBlank(message = "对接人不能为空")
@Schema(description = "对接人")
@Length(max =20,message = "险种名称必须小于等于20")
private String companyDocking;
/**
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @ 736bffde
......@@ -203,6 +203,12 @@ public class TInsuranceDetail extends BaseEntity {
@Schema(description = "预估保费")
private BigDecimal estimatePremium;
/**
* 是否标记投保成功标识 0 未标记过 1标记过
*/
@Schema(description = "是否标记投保成功标识 0 未标记过 1标记过")
private Integer signFlag;
/**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
*/
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
View file @ 736bffde
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;
......@@ -20,26 +22,32 @@ public class TInsuranceRefund extends BaseEntity {
/**
* 主键id
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**
* 保单信息主键
*/
@Schema(description = "保单信息主键")
private String insDetailId;
/**
* 减员状态
*/
@Schema(description = "减员状态")
private Integer reduceHandleStatus;
/**
* 退费金额
*/
@Schema(description = "退费金额")
private BigDecimal refundMoney;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
/**
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceSettle.java
View file @ 736bffde
......@@ -33,7 +33,7 @@ public class TInsuranceSettle implements Serializable {
private String insDetailId;
/**
* 结算状态
* 结算状态 1、待结算,2、结算中,3、已结算
*/
@Schema(description = "结算状态 1、待结算,2、结算中,3、已结算")
private String settleHandleStatus;
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceType.java
View file @ 736bffde
......@@ -8,10 +8,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Max;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* 险种表
......@@ -27,13 +27,14 @@ public class TInsuranceType extends BaseEntity {
*/
@Schema(description = "险种id")
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private String id;
/**
* 险种名称
*/
@NotBlank(message = "险种名称不能为空")
@Schema(description = "险种名称")
@Length(max =50,message = "险种名称必须小于等于50")
private String name;
/**
......@@ -48,6 +49,7 @@ public class TInsuranceType extends BaseEntity {
*/
@NotBlank(message = "收款单位名称不能为空")
@Schema(description = "收款单位名称")
@Length(max =50,message = "收款单位名称必须小于等于50")
private String receiptUnitName;
/**
......@@ -55,6 +57,7 @@ public class TInsuranceType extends BaseEntity {
*/
@NotBlank(message = "收款银行名称不能为空")
@Schema(description = "收款银行名称")
@Length(max =50,message = "收款银行名称必须小于等于50")
private String bankName;
/**
......@@ -62,6 +65,7 @@ public class TInsuranceType extends BaseEntity {
*/
@NotBlank(message = "收款银行账号不能为空")
@Schema(description = "收款银行账号")
@Length(max =50,message = "收款银行账号必须小于等于50")
private String bankNo;
/**
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceTypeStandard.java
View file @ 736bffde
......@@ -25,7 +25,7 @@ public class TInsuranceTypeStandard extends BaseEntity {
/**
* 购买标准id
*/
@Schema(description = "保险公司id")
@Schema(description = "购买标准id")
@TableId(type = IdType.ASSIGN_ID)
private String id;
......@@ -34,7 +34,7 @@ public class TInsuranceTypeStandard extends BaseEntity {
*/
@Schema(description = "险种主键ID")
@NotBlank(message = "险种主键ID不能为空")
private Long insuranceTypeId;
private String insuranceTypeId;
/**
* 购买标准
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/LocalDateUtil.java
View file @ 736bffde
......@@ -74,9 +74,14 @@ public class LocalDateUtil {
* @return {@link LocalDate}
*/
public static LocalDate parseLocalDate(String strDate){
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(NORM_DATE_PATTERN, Locale.CHINA);
LocalDate localDate = LocalDate.parse(strDate, dateTimeFormatter);
return localDate;
try {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(NORM_DATE_PATTERN, Locale.CHINA);
LocalDate localDate = LocalDate.parse(strDate, dateTimeFormatter);
return localDate;
}catch (Exception e){
e.printStackTrace();
return null;
}
}
/**
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @ 736bffde
......@@ -4,6 +4,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ValidityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import java.math.BigDecimal;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
......@@ -152,6 +153,29 @@ public class ValidityUtil {
return idCard.matches(ValidityConstants.IDCARD_PATTERN) ;
}
/**
* 判断是否是整数或者是携带一位或者两位的小数
* @param money 金额
* @return boolean
*/
public static boolean validateMoney(final String money) {
if(Common.isEmpty(money)){
return Boolean.FALSE ;
}
if(!BigDecimalUtils.isBigDecimal(money)){
return Boolean.FALSE ;
}
if(!money.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){
return Boolean.FALSE ;
}
BigDecimal bigDecimalMoney= new BigDecimal(money);
boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0;
if(max){
return Boolean.FALSE ;
}
return Boolean.TRUE;
}
/**
* 姓名验证
*
......@@ -259,7 +283,7 @@ public class ValidityUtil {
}
/**
* 验证字符串 最多50位
* 验证字符串 最多60位
*
* @author licancan
* @param str
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/DeptChangeCheckParam.java
View file @ 736bffde
......@@ -15,7 +15,11 @@ import java.io.Serializable;
@Tag(name = "变更所属项目")
public class DeptChangeCheckParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
//姓名+身份证号+原项目编码+保险公司+险种+保单开始时间+保单结束时间+保单结束时间+标准+有效+未减员 是否存在校验
/**
* 商险id
*/
@Schema(description = "商险id")
private String id;
/**
* 员工姓名
*/
......@@ -76,9 +80,34 @@ public class DeptChangeCheckParam implements Serializable {
private String errorMessage;
/**
* 结算方式
* 新项目结算方式
*/
@Schema(description = "结算方式")
private Integer newSettleType;
/**
* 旧项目结算方式
*/
@Schema(description = "结算方式")
private Integer settleType;
private Integer oldSettleType;
/**
* 默认结算id
*/
@Schema(description = "默认结算id")
private String defaultSettleId;
/**
* 预估保费
*/
@Schema(description = "预估保费")
private String estimatePremium;
/**
* 实际保费
*/
@Schema(description = "实际保费")
private String actualPremium;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
View file @ 736bffde
......@@ -128,7 +128,7 @@ public class InsuranceBatchParam implements Serializable {
* 险种主键
*/
@JsonIgnore
private Long insuranceTypeId;
private String insuranceTypeId;
/**
* 商险购买地省code
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceEditParam.java
View file @ 736bffde
......@@ -155,5 +155,5 @@ public class InsuranceEditParam implements Serializable {
* 险种主键
*/
@JsonIgnore
private Long insuranceTypeId;
private String insuranceTypeId;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java
View file @ 736bffde
......@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author licancan
......@@ -27,6 +28,12 @@ public class InsuranceListParam implements Serializable {
@Schema(description = "投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
private Integer buyHandleStatus;
/**
* 投保列表专用字段
*/
@Schema(description = "投保状态 集合中只能有这三个状态 1待投保 2投保中 4投保退回")
private List<Integer> buyHandleStatusList;
/**
* 员工姓名
*/
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java
View file @ 736bffde
......@@ -171,5 +171,9 @@ public class InsuranceRefundListVo implements Serializable {
@Schema(description = "减员状态 1待减员 2减员中3减员退回")
private Integer reduceHandleStatus;
/**
* 购买月数
*/
@Schema(description = "购买月数")
private Long buyMonth;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java
View file @ 736bffde
......@@ -226,6 +226,14 @@ public class InsuredListVo implements Serializable {
@Schema(description = "创建人(派单人)")
private String createName;
/**
* 购买月数
*/
@Schema(description = "购买月数")
private Long buyMonth;
//订单编号、姓名、身份证号、投保类型、项目、岗位、保单开始日期、保单结束日期、保险公司、险种、购买标准、医保、身故或残疾、预估保费、实际保费、保单号、发票号、保单生效日期、商险购买地、商险办理地、是否出险、是否过期、是否失效、派单日期、派单人
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/RefundExportListVo.java
View file @ 736bffde
......@@ -183,5 +183,15 @@ public class RefundExportListVo implements Serializable {
@Schema(description = "备注")
private String remark;
/**
* 购买月数
*/
@Schema(description = "购买月数")
private Long buyMonth;
/**
* 购买天数
*/
@Schema(description = "购买天数")
private long buyDay;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/SettleMonthChangeCheckParam.java
View file @ 736bffde
......@@ -15,7 +15,12 @@ import java.io.Serializable;
@Tag(name = "结算月变更")
public class SettleMonthChangeCheckParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L;
//姓名+身份证号+原项目编码+保险公司+险种+保单开始时间+保单结束时间+保单结束时间+标准+有效+未减员 是否存在校验
/**
* 商险id
*/
@Schema(description = "商险id")
private String id;
/**
* 员工姓名
*/
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefundDetail.java → yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TInsuranceRefundDetail.java
View file @ 736bffde
package com.yifu.cloud.plus.v1.yifu.insurances.entity;
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceCompanyController.java
View file @ 736bffde
......@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.yifu.insurances.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.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.insurances.entity.TInsuranceCompany;
......@@ -12,7 +11,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
......@@ -88,7 +86,7 @@ public class TInsuranceCompanyController {
* @return
*/
@Operation(summary = "查询保险公司列表（不分页）", description = "查询保险公司列表（不分页）")
@GetMapping("/list" )
@GetMapping("/list")
public R<List<TInsuranceCompany>> getInsuranceCompanyList() {
return R.ok(insuranceCompanyService.getInsuranceCompanyList());
}
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @ 736bffde
......@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.yifu.insurances.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.util.R;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
import io.swagger.v3.oas.annotations.Operation;
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java
View file @ 736bffde
......@@ -4,7 +4,7 @@ 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.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefundDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceRefundDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceRefundMapper.java
View file @ 736bffde
......@@ -23,4 +23,6 @@ public interface TInsuranceRefundMapper extends BaseMapper<TInsuranceRefund> {
TInsuranceRefund getByInsDetailId(String id);
void updateByInsDetailId(TInsuranceRefund insuranceRefund);
int updateRefundMoney(TInsuranceRefund insuranceRefund);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeMapper.java
View file @ 736bffde
......@@ -48,4 +48,7 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
* @return {@link IPage< InsuranceTypeVo>}
*/
IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") TInsuranceType insuranceType);
InsuranceTypeVo getInsuranceTypeDetailById(String id);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceRefundService.java
View file @ 736bffde
......@@ -15,4 +15,6 @@ public interface TInsuranceRefundService extends IService<TInsuranceRefund> {
void updateByInsDetailId(TInsuranceRefund insuranceRefund);
int updateRefundMoney(TInsuranceRefund insuranceRefund);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceRefundServiceImpl.java
View file @ 736bffde
......@@ -24,4 +24,11 @@ implements TInsuranceRefundService {
public void updateByInsDetailId(TInsuranceRefund insuranceRefund) {
this.baseMapper.updateByInsDetailId(insuranceRefund);
}
@Override
public int updateRefundMoney(TInsuranceRefund insuranceRefund) {
return this.baseMapper.updateRefundMoney(insuranceRefund);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeRateServiceImpl.java
View file @ 736bffde
......@@ -101,22 +101,23 @@ public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRat
return R.failed("当前险种信息不存在或已被删除");
}
String month = insuranceTypeRate.getMonth();
if (!ValidityUtil.isMonth(month)){
if (!ValidityUtil.validatePositiveInt(month)){
return R.failed("当前月份格式不正确");
}
String rate = insuranceTypeRate.getRate();
if (!Common.isNumber(rate)){
if (!ValidityUtil.validateMoney(rate)){
return R.failed("当前费率格式不正确");
}
LambdaQueryWrapper<TInsuranceTypeRate> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TInsuranceTypeRate::getDeleteFlag, CommonConstants.ZERO_INT).eq(TInsuranceTypeRate::getInsuranceTypeId,insuranceTypeId)
.eq(TInsuranceTypeRate :: getRate,insuranceTypeRate.getRate()).eq(TInsuranceTypeRate:: getMonth ,insuranceTypeRate.getMonth());
.eq(TInsuranceTypeRate:: getMonth ,insuranceTypeRate.getMonth());
List<TInsuranceTypeRate> list = this.list(queryWrapper);
if (list.isEmpty()){
insuranceTypeRate.setDeleteFlag(CommonConstants.ZERO_INT);
insuranceTypeRate.setCreateBy(user.getId());
insuranceTypeRate.setCreateName(user.getNickname());
insuranceTypeRate.setCreateTime(LocalDateTime.now());
return R.ok(this.baseMapper.insert(insuranceTypeRate));
}else{
return R.failed("当前险种已存在相同的费率");
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeServiceImpl.java
View file @ 736bffde
......@@ -58,26 +58,38 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
* 新增险种信息
*
* @author zhaji
* @param insuranceType 新增参数
* @param insuranceType 新增险种信息
* @return {@link R}
*/
@Override
public R saveInsuranceType(TInsuranceType insuranceType) {
if(Common.isEmpty(insuranceType)){
return R.failed("新增的险种信息为空");
}
YifuUser user = SecurityUtils.getUser();
String companyId = insuranceType.getInsuranceCompanyId();
String bankNo = insuranceType.getBankNo();
if(!Common.isNumber(bankNo)){
String bankName = insuranceType.getBankName();
String receiptUnitName = insuranceType.getReceiptUnitName();
if (!ValidityUtil.validate50(insuranceType.getName())){
return R.failed("险种格式不正确");
}
if(!ValidityUtil.validatePositiveInt(bankNo) || !ValidityUtil.validate50(bankNo)){
return R.failed("银行账号格式不正确");
}
if(!ValidityUtil.validate50(bankName)){
return R.failed("收款银行格式不正确");
}
if(!ValidityUtil.validate50(receiptUnitName)){
return R.failed("收款单位名称格式不正确");
}
LambdaQueryWrapper<TInsuranceCompany> companyWrapper = new LambdaQueryWrapper<>();
companyWrapper.eq(TInsuranceCompany::getId,companyId).eq(TInsuranceCompany::getDeleteFlag, CommonConstants.ZERO_INT);
TInsuranceCompany insuranceCompany = insuranceCompanyService.getOne(companyWrapper);
if(Common.isEmpty(insuranceCompany)){
return R.failed("所属保险公司不存在或已被删除");
}
if (!ValidityUtil.validate50(insuranceType.getName())){
return R.failed("险种名称过长");
}
LambdaQueryWrapper<TInsuranceType> typeWrapper = new LambdaQueryWrapper<>();
typeWrapper.eq(TInsuranceType :: getInsuranceCompanyId ,companyId).eq(TInsuranceType::getName,insuranceType.getName()).eq(TInsuranceType::getDeleteFlag, CommonConstants.ZERO_INT);
TInsuranceType type = getOne(typeWrapper);
......@@ -104,12 +116,10 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
if (Common.isEmpty(id)){
return R.failed("险种ID不能为空");
}
InsuranceTypeVo insuranceTypeVo = new InsuranceTypeVo();
TInsuranceType byId = getById(id);
if(Common.isEmpty(byId) || byId.getDeleteFlag() == CommonConstants.ONE_INT){
InsuranceTypeVo insuranceTypeVo = this.baseMapper.getInsuranceTypeDetailById(id);
if(Common.isEmpty(insuranceTypeVo)){
return R.failed("当前险种信息不存在或已被删除");
}
BeanCopyUtils.copyProperties(byId,insuranceTypeVo);
List<TInsuranceTypeRate> tInsuranceTypeRates = this.baseMapper.selectInsuranceTypeRateList(id);
List<TInsuranceTypeStandard> tInsuranceTypeStandards = this.baseMapper.selectInsuranceTypeStandardList(id);
insuranceTypeVo.setInsuranceTypeRateList(tInsuranceTypeRates);
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeStandardServiceImpl.java
View file @ 736bffde
......@@ -9,13 +9,15 @@ 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.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -31,16 +33,20 @@ import java.util.List;
@Service
public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTypeStandardMapper, TInsuranceTypeStandard> implements TInsuranceTypeStandardService {
@Resource
private TInsuranceTypeService insuranceTypeService;
private TInsuranceTypeService tInsuranceTypeService;
@Resource
private TInsuranceDetailService insuranceDetailService;
private TInsuranceDetailService tInsuranceDetailService;
@Resource
private TInsuranceOperateService tInsuranceOperateService;
/**
* 查询购买标准列表
*
* @author zhaji
* @param id
* @param id 购买标准id
* @return {@link R}
*/
@Override
......@@ -48,7 +54,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
if (Common.isEmpty(id)){
return R.failed("险种id为空");
}
TInsuranceType byId = insuranceTypeService.getById(id);
TInsuranceType byId = tInsuranceTypeService.getById(id);
if ( Common.isEmpty(byId) || CommonConstants.ONE_INT == byId.getDeleteFlag()){
return R.failed("当前险种信息不存在或已被删除");
}
......@@ -61,7 +67,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
* 删除购买标准
*
* @author zhaji
* @param id
* @param id 购买标准id
* @return {@link R}
*/
@Override
......@@ -79,7 +85,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
queryWrapper.eq(TInsuranceDetail::getInsuranceTypeId,byId.getInsuranceTypeId())
.eq(TInsuranceDetail::getBuyStandard,byId.getBuyStandard())
.eq(TInsuranceDetail::getDeleteFlag,CommonConstants.ZERO_INT);
List<TInsuranceDetail> list = insuranceDetailService.list(queryWrapper);
List<TInsuranceDetail> list = tInsuranceDetailService.list(queryWrapper);
if (Common.isNotEmpty(list)){
return R.failed("当前险种的购买标准已存在对应的商险信息，不能删除");
}
......@@ -94,7 +100,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
* 新增购买标准
*
* @author zhaji
* @param insuranceTypeStandard
* @param insuranceTypeStandard 购买标准
* @return {@link R}
*/
@Override
......@@ -104,22 +110,22 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
if (Common.isEmpty(insuranceTypeStandard)){
return R.failed("新增的购买标准信息为空");
}
Long insuranceTypeId = insuranceTypeStandard.getInsuranceTypeId();
TInsuranceType byId = insuranceTypeService.getById(insuranceTypeId);
String insuranceTypeId = insuranceTypeStandard.getInsuranceTypeId();
TInsuranceType byId = tInsuranceTypeService.getById(insuranceTypeId);
if ( Common.isEmpty(byId) || CommonConstants.ONE_INT == byId.getDeleteFlag()){
return R.failed("当前险种信息不存在或已被删除");
return R.failed("险种信息不存在或已被删除");
}
String buyStandard = insuranceTypeStandard.getBuyStandard();
String medicalQuota = insuranceTypeStandard.getMedicalQuota();
String dieDisableQuota = insuranceTypeStandard.getDieDisableQuota();
if (!Common.isNumber(buyStandard)){
return R.failed("当前购买标准格式不正确");
if (!ValidityUtil.validateMoney(buyStandard)){
return R.failed("购买标准格式不正确");
}
if (!Common.isNumber(medicalQuota)){
return R.failed("当前医疗额度格式不正确");
if (!ValidityUtil.validateMoney(medicalQuota)){
return R.failed("医疗额度格式不正确");
}
if (!Common.isNumber(dieDisableQuota)){
return R.failed("当前身故或残疾额度格式不正确");
if (!ValidityUtil.validateMoney(dieDisableQuota)){
return R.failed("身故或残疾额度格式不正确");
}
LambdaQueryWrapper<TInsuranceTypeStandard> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TInsuranceTypeStandard::getInsuranceTypeId,insuranceTypeStandard.getInsuranceTypeId())
......@@ -137,4 +143,6 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
}
}
}
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceCompanyMapper.xml
View file @ 736bffde
......@@ -5,7 +5,7 @@
<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper">
<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany">
<id property="id" column="ID" jdbcType="BIGINT"/>
<id property="id" column="ID" jdbcType="VARCHAR"/>
<result property="companyName" column="COMPANY_NAME" jdbcType="VARCHAR"/>
<result property="companyAddress" column="COMPANY_ADDRESS" jdbcType="VARCHAR"/>
<result property="companyDocking" column="COMPANY_DOCKING" jdbcType="VARCHAR"/>
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml
View file @ 736bffde
......@@ -35,6 +35,7 @@
<result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
<result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
<result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
<result property="signFlag" column="SIGN_FLAG" jdbcType="TINYINT"/>
<result property="buyHandleStatus" column="BUY_HANDLE_STATUS" jdbcType="TINYINT"/>
<result property="defaultSettleId" column="DEFAULT_SETTLE_ID" jdbcType="VARCHAR"/>
<result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/>
......@@ -58,7 +59,7 @@
BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
BUY_TYPE,INSURANCE_PROVINCE,INSURANCE_PROVINCE_NAME,INSURANCE_CITY,INSURANCE_CITY_NAME,
INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SIGN_FLAG,
BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,
......@@ -100,6 +101,12 @@
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.buyHandleStatusList != null and param.buyHandleStatusList.size > 0">
and detail.BUY_HANDLE_STATUS in
<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
ORDER BY detail.CREATE_TIME DESC
</select>
......@@ -139,6 +146,12 @@
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.buyHandleStatusList != null and param.buyHandleStatusList.size > 0">
and detail.BUY_HANDLE_STATUS in
<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
ORDER BY detail.CREATE_TIME DESC
</select>
......@@ -541,8 +554,6 @@
t_insurance_refund refund
where
detail.ID = refund.INS_DETAIL_ID
and
(detail.REDUCE_HANDLE_STATUS is not null and detail.REDUCE_HANDLE_STATUS != 3)
<if test="param.empName != null and param.empName.trim() != ''">
and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
</if>
......@@ -607,9 +618,6 @@
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.reduceHandleStatus != null ">
and detail.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
</if>
<if test="param.isOverdue != null ">
and detail.IS_OVERDUE like concat('%',replace(replace(#{param.isOverdue},'_','\_'),'%','\%'),'%')
</if>
......@@ -632,7 +640,7 @@
</foreach>
</select>
<!-- 查询保单减员退费信息-->
<select id="selectRefundDetail" resultType="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefundDetail">
<select id="selectRefundDetail" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceRefundDetail">
select
detail.DEPT_NO as deptNo,
detail.EMP_NAME as empName,
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceRefundMapper.xml
View file @ 736bffde
......@@ -25,11 +25,22 @@
t_insurance_refund
set
REDUCE_HANDLE_STATUS = #{reduceHandleStatus},
REMARK = #{remark},
UPDATE_BY = #{createBy},
UPDATE_TIME = #{createTime}
where
INS_DETAIL_ID = #{insDetailId}
</update>
<update id="updateRefundMoney">
update
t_insurance_refund
set
REFUND_MONEY = #{refundMoney},
UPDATE_BY = #{updateBy},
UPDATE_TIME = #{updateTime}
where
INS_DETAIL_ID = #{insDetailId}
</update>
<select id="getByInsDetailId" resultType="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund">
</select>
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml
View file @ 736bffde
......@@ -5,9 +5,9 @@
<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper">
<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType">
<id property="id" column="ID" jdbcType="BIGINT"/>
<id property="id" column="ID" jdbcType="VARCHAR"/>
<result property="name" column="NAME" jdbcType="VARCHAR"/>
<result property="insuranceCompanyId" column="INSURANCE_COMPANY_ID" jdbcType="BIGINT"/>
<result property="insuranceCompanyId" column="INSURANCE_COMPANY_ID" jdbcType="VARCHAR"/>
<result property="receiptUnitName" column="RECEIPT_UNIT_NAME" jdbcType="VARCHAR"/>
<result property="bankName" column="BANK_NAME" jdbcType="VARCHAR"/>
<result property="bankNo" column="BANK_NO" jdbcType="VARCHAR"/>
......@@ -71,5 +71,24 @@
a.DELETE_FLAG = 0
</select>
<select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">
select
a.ID as id,
a.NAME as name ,
b.COMPANY_NAME as insuranceCompanyName,
a.INSURANCE_COMPANY_ID as insuranceCompanyId,
a.RECEIPT_UNIT_NAME as receiptUnitName,
a.BANK_NAME as bankName,
a.BANK_NO as bankNo
from
t_insurance_type a,
t_insurance_company b
where
a.INSURANCE_COMPANY_ID = b.ID
and
a.ID = #{id}
and
a.DELETE_FLAG = 0
</select>
</mapper>
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeStandardMapper.xml
View file @ 736bffde
......@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard">
<id property="id" column="ID" jdbcType="VARCHAR"/>
<result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="BIGINT"/>
<result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
<result property="buyStandard" column="BUY_STANDARD" jdbcType="VARCHAR"/>
<result property="medicalQuota" column="MEDICAL_QUOTA" jdbcType="VARCHAR"/>
<result property="dieDisableQuota" column="DIE_DISABLE_QUOTA" jdbcType="VARCHAR"/>
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @ 736bffde
......@@ -96,7 +96,7 @@ public class TDispatchInfo extends BaseEntity {
* 员工类型
*/
@Length(max = 32, message = "员工类型 不能超过32个字符" )
@ExcelAttribute(name = "员工类型", maxLength = 32)
@ExcelAttribute(name = "员工类型", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型" )
@ExcelProperty("员工类型" )
private String empType;
......@@ -112,7 +112,7 @@ public class TDispatchInfo extends BaseEntity {
* 民族
*/
@Length(max = 32, message = "民族 不能超过32个字符" )
@ExcelAttribute(name = "民族", maxLength = 32)
@ExcelAttribute(name = "民族", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATIONAL)
@Schema(description = "民族" )
@ExcelProperty("民族" )
private String empNational;
......@@ -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/TForecastLibrary.java
View file @ 736bffde
......@@ -32,6 +32,7 @@ import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.List;
import java.util.Set;
/**
* 预估费用
......@@ -157,10 +158,10 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty("个人医疗费用")
private BigDecimal personalMedicalFee;
/**
* 个人工伤费用
* 个人失业费用
*/
@ExcelAttribute(name = "个人工伤费用")
@ExcelProperty("个人工伤费用")
@ExcelAttribute(name = "个人失业费用")
@ExcelProperty("个人失业费用")
private BigDecimal personalUnemploymentFee;
/**
* 个人医疗救助金
......@@ -197,70 +198,76 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty("公积金生成月份")
private String providentCreateMonth;
/**
* 单位社保金额
* 单位社保合计
*/
@ExcelAttribute(name = "单位社保金额")
@ExcelProperty("单位社保金额")
@ExcelAttribute(name = "单位社保合计")
@ExcelProperty("单位社保合计")
private BigDecimal unitSocialSum;
/**
* 单位公积金金额
* 单位公积金合计
*/
@ExcelAttribute(name = "单位公积金金额")
@ExcelProperty("单位公积金金额")
@ExcelAttribute(name = "单位公积金合计")
@ExcelProperty("单位公积金合计")
private BigDecimal unitFundSum;
/**
* 个人社保金额
* 个人社保合计
*/
@ExcelAttribute(name = "个人社保金额")
@ExcelProperty("个人社保金额")
@ExcelAttribute(name = "个人社保合计")
@ExcelProperty("个人社保合计")
private BigDecimal personalSocialSum;
/**
* 个人公积金金额
* 个人公积金合计
*/
@ExcelAttribute(name = "个人公积金金额")
@ExcelProperty("个人公积金金额")
@ExcelAttribute(name = "个人公积金合计")
@ExcelProperty("个人公积金合计")
private BigDecimal personalFundSum;
/**
* 缴纳地-省
* 费用合计
*/
@ExcelAttribute(name = "缴纳地-省", maxLength = 32)
@Length(max = 32, message = "缴纳地-省不能超过32个字符")
@ExcelProperty("缴纳地-省")
@ExcelAttribute(name = "费用合计")
@ExcelProperty("费用合计")
private BigDecimal sumAll;
/**
* 公积金缴纳地-省
*/
@ExcelAttribute(name = "公积金缴纳地-省", maxLength = 32)
@Length(max = 32, message = "公积金缴纳地-省不能超过32个字符")
@ExcelProperty("公积金缴纳地-省")
private String fundProvince;
/**
* 缴纳地-市
*/
@ExcelAttribute(name = "缴纳地-市", maxLength = 32)
@Length(max = 32, message = "缴纳地-市不能超过32个字符")
@ExcelProperty("缴纳地-市")
@ExcelAttribute(name = "公积金缴纳地-市", maxLength = 32)
@Length(max = 32, message = "公积金缴纳地-市不能超过32个字符")
@ExcelProperty("公积金缴纳地-市")
private String fundCity;
/**
* 缴纳地-县
* 公积金缴纳地-县
*/
@ExcelAttribute(name = "缴纳地-县", maxLength = 32)
@Length(max = 32, message = "缴纳地-县不能超过32个字符")
@ExcelProperty("缴纳地-县")
@ExcelAttribute(name = "公积金缴纳地-县", maxLength = 32)
@Length(max = 32, message = "公积金缴纳地-县不能超过32个字符")
@ExcelProperty("公积金缴纳地-县")
private String fundTown;
/**
* 缴纳地-省
* 社保缴纳地-省
*/
@ExcelAttribute(name = "缴纳地-省", maxLength = 32)
@Length(max = 32, message = "缴纳地-省不能超过32个字符")
@ExcelProperty("缴纳地-省")
@ExcelAttribute(name = "社保缴纳地-省", maxLength = 32)
@Length(max = 32, message = "社保缴纳地-省不能超过32个字符")
@ExcelProperty("社保缴纳地-省")
private String socialProvince;
/**
* 缴纳地-市
* 社保缴纳地-市
*/
@ExcelAttribute(name = "缴纳地-市", maxLength = 32)
@Length(max = 32, message = "缴纳地-市不能超过32个字符")
@ExcelProperty("缴纳地-市")
@ExcelAttribute(name = "社保缴纳地-市", maxLength = 32)
@Length(max = 32, message = "社保缴纳地-市不能超过32个字符")
@ExcelProperty("社保缴纳地-市")
private String socialCity;
/**
* 缴纳地-县
* 社保缴纳地-县
*/
@ExcelAttribute(name = "缴纳地-县", maxLength = 32)
@Length(max = 32, message = "缴纳地-县不能超过32个字符")
@ExcelProperty("缴纳地-县")
@ExcelAttribute(name = "社保缴纳地-县", maxLength = 32)
@Length(max = 32, message = "社保缴纳地-县不能超过32个字符")
@ExcelProperty("社保缴纳地-县")
private String socialTown;
/**
* 单位养老基数
......@@ -421,11 +428,11 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty("项目档案id")
private String projectId;
/**
* 单位名称
* 客户名称
*/
@ExcelAttribute(name = "单位名称", maxLength = 50)
@Length(max = 50, message = "单位名称不能超过50个字符")
@ExcelProperty("单位名称")
@ExcelAttribute(name = "客户名称", maxLength = 50)
@Length(max = 50, message = "客户名称不能超过50个字符")
@ExcelProperty("客户名称")
private String unitName;
/**
* 项目名称
......@@ -434,6 +441,13 @@ public class TForecastLibrary extends BaseEntity {
@Length(max = 50, message = "项目名称不能超过50个字符")
@ExcelProperty("项目名称")
private String deptName;
/**
* 项目编码
*/
@ExcelAttribute(name = "项目编码", maxLength = 50)
@Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("项目编码")
private String deptNo;
/**
* 员工类型（字典值，0外包1派遣2代理）
*/
......@@ -482,10 +496,10 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty("公积金户")
private String providentHouseholdName;
/**
* 数据同步：0未同步；1已同步
* 同步状态：0未同步；1已同步
*/
@ExcelAttribute(name = "数据同步：0未同步；1已同步")
@ExcelProperty("数据同步：0未同步；1已同步")
@ExcelAttribute(name = "同步状态：0未同步；1已同步")
@ExcelProperty("同步状态：0未同步；1已同步")
private Integer dataPush;
/**
* 类型：0社保；1公积金
......@@ -511,6 +525,9 @@ public class TForecastLibrary extends BaseEntity {
@TableField(exist = false)
private String createTimeEnd;
@TableField(exist = false)
@Schema(description = "导出的表头的Set")
private Set<String> exportFields;
/**
* 查询数据起
**/
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @ 736bffde
......@@ -121,7 +121,8 @@ public class TPreDispatchInfo extends BaseEntity {
* 入职日期
*/
@Schema(description ="入职日期")
private Date entryDate;
@Size(max = 20, message = "入职日期不可超过20位")
private String entryDate;
/**
* 正式工资
......@@ -345,6 +346,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 派单客服
*/
@Schema(description ="派单客服")
@Size(max = 20, message = "派单客服不可超过20位")
private String customerService;
/**
......@@ -357,6 +359,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 唯一号
*/
@Schema(description ="唯一号")
@Size(max = 20, message = "唯一号不可超过20位")
private String uniqueNumber;
/**
......@@ -369,6 +372,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 服务类别
*/
@Schema(description ="服务类别")
@Size(max = 20, message = "服务类别不可超过20位")
private String serviceType;
/**
......@@ -476,9 +480,9 @@ public class TPreDispatchInfo extends BaseEntity {
private String unitIdAdd;
/**
* 所属结算主体ID
* 所属项目ID
*/
@Schema(description ="所属结算主体ID")
@Schema(description ="所属项目ID")
private String departIdAdd;
/**
......@@ -488,9 +492,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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -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/TDispatchInfoExportVo.java 0 → 100644
View file @ 736bffde
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 派单导出Vo
* @author hgw
* @date 2022-7-28 10:40:34
*/
@Data
@Schema(description = "派单导出Vo")
public class TDispatchInfoExportVo {
@Schema(description = "主键")
@ExcelProperty("主键")
private String id;
@ExcelAttribute(name = "申请编码", maxLength = 30)
@Schema(description = "申请编码")
@ExcelProperty("申请编码")
private String dispatchCode;
@ExcelAttribute(name = "员工编码", maxLength = 30)
@Schema(description = "员工编码")
@ExcelProperty("员工编码")
private String empNo;
@ExcelAttribute(name = "员工姓名", maxLength = 50)
@Schema(description = "员工姓名")
@ExcelProperty("员工姓名")
private String empName;
@ExcelAttribute(name = "身份证号", maxLength = 20)
@Schema(description = "身份证号")
@ExcelProperty("身份证号")
private String empIdcard;
@ExcelAttribute(name = "员工类型", isDataId = true, dataType = ExcelAttributeConstants.EMP_NATRUE)
@Schema(description = "员工类型")
@ExcelProperty("员工类型")
private String empType;
@ExcelAttribute(name = "社保公积金类型", readConverterExp = "0=社保,1=公积金")
@Schema(description = "社保公积金类型：0社保1公积金")
@ExcelProperty("社保公积金类型")
private String typeSub;
@ExcelAttribute(name = "单位名称", maxLength = 50)
@Schema(description = "单位名称")
@ExcelProperty("单位名称")
private String belongUnitName;
@ExcelAttribute(name = "项目名称", maxLength = 50)
@Schema(description = "项目名称")
@ExcelProperty("项目名称")
private String settleDomainName;
@ExcelAttribute(name = "项目编码", maxLength = 50)
@Schema(description = "项目编码")
@ExcelProperty("项目编码")
private String settleDomainCode;
@ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
@Schema(description = "派单类型：0派增1派减")
@ExcelProperty("派单类型")
private String type;
@ExcelAttribute(name = "派单项", maxLength = 50)
@Schema(description = "派单项：如 养老、公积金")
@ExcelProperty("派单项")
private String dispatchItem;
@ExcelAttribute(name = "社保户", maxLength = 32)
@Schema(description = "社保户")
@ExcelProperty("社保户")
private String socialHouseholdName;
@ExcelAttribute(name = "公积金户", maxLength = 32)
@Schema(description = "公积金户")
@ExcelProperty("公积金户")
private String providentHouseholdName;
@ExcelAttribute(name = "审核状态", readConverterExp = "1=待审核,2=审核通过,3=审核不通过")
@Schema(description = "审核状态：1待审核2审核通过3审核不通过")
@ExcelProperty("审核状态")
private String status;
@ExcelAttribute(name = "社保办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=部分办理成功,4=办理中")
@Schema(description = "社保办理状态 0 待办理 1 办理成功 2 办理失败 3 部分办理成功 4 办理中")
@ExcelProperty("社保办理状态")
private String socialHandleStatus;
@ExcelAttribute(name = "公积金办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema(description = "公积金办理状态:0 待办理 1办理成功 2 办理失败 3 已派减")
@ExcelProperty("公积金办理状态")
private String fundHandleStatus;
@Schema(description = "申请人")
@ExcelProperty("申请人")
private String createName;
@ExcelAttribute(name = "申请人所在部门", maxLength = 50)
@Schema(description = "申请人所在部门")
@ExcelProperty("申请人所在部门")
private String organName;
@Schema(description = "申请时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty("申请时间")
private LocalDateTime createTime;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoSearchVo.java
View file @ 736bffde
......@@ -16,11 +16,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.TDispatchInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
/**
* 派单信息记录表
......@@ -31,28 +34,34 @@ import java.time.LocalDateTime;
@Data
public class TDispatchInfoSearchVo extends TDispatchInfo {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
@TableField(exist = false)
@Schema(description = "导出的表头的Set")
private Set<String> exportFields;
/**
* 创建时间区间 [开始时间，结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
@Schema(description = "选中的idList")
private List<String> idList;
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,多个逗号分割")
private String ids;
/**
* 创建时间区间 [开始时间，结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoVo.java
View file @ 736bffde
......@@ -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/TForecastLibraryExportVo.java 0 → 100644
View file @ 736bffde
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
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;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 预估费用导出Vo
*
* @author hgw
* @date 2022-7-28 15:20:24
*/
@Data
@Schema(description = "预估费用导出Vo")
public class TForecastLibraryExportVo {
@ExcelProperty("主键")
private String id;
@ExcelAttribute(name = "员工编码", maxLength = 32)
@ExcelProperty("员工编码")
private String empNo;
@ExcelAttribute(name = "员工姓名", maxLength = 32)
@ExcelProperty("员工姓名")
private String empName;
@ExcelAttribute(name = "身份证号", maxLength = 20)
@ExcelProperty("身份证号")
private String empIdcard;
@ExcelAttribute(name = "客户名称", maxLength = 50)
@ExcelProperty("客户名称")
private String unitName;
@ExcelAttribute(name = "项目名称", maxLength = 50)
@ExcelProperty("项目名称")
private String deptName;
@ExcelAttribute(name = "项目编码", maxLength = 50)
@ExcelProperty("项目编码")
private String deptNo;
@ExcelAttribute(name = "单位养老费用")
@ExcelProperty("单位养老费用")
private BigDecimal unitPensionFee;
@ExcelAttribute(name = "单位医疗费用")
@ExcelProperty("单位医疗费用")
private BigDecimal unitMedicalFee;
@ExcelAttribute(name = "单位失业费用")
@ExcelProperty("单位失业费用")
private BigDecimal unitUnemploymentFee;
@ExcelAttribute(name = "单位工伤费用")
@ExcelProperty("单位工伤费用")
private BigDecimal unitWorkInjuryFee;
@ExcelAttribute(name = "单位生育费用")
@ExcelProperty("单位生育费用")
private BigDecimal unitBirthFee;
@ExcelAttribute(name = "单位大病救助")
@ExcelProperty("单位大病救助")
private BigDecimal unitBitailmentFee;
@ExcelAttribute(name = "个人养老费用")
@ExcelProperty("个人养老费用")
private BigDecimal personalPensionFee;
@ExcelAttribute(name = "个人医疗费用")
@ExcelProperty("个人医疗费用")
private BigDecimal personalMedicalFee;
@ExcelAttribute(name = "个人失业费用")
@ExcelProperty("个人失业费用")
private BigDecimal personalUnemploymentFee;
@ExcelAttribute(name = "个人大病费用")
@ExcelProperty("个人大病费用")
private BigDecimal personalBigailmentFee;
@ExcelAttribute(name = "社保缴纳月份", maxLength = 6)
@ExcelProperty("社保缴纳月份")
private String socialPayMonth;
@ExcelAttribute(name = "社保生成月份", maxLength = 6)
@ExcelProperty("社保生成月份")
private String socialCreateMonth;
@ExcelAttribute(name = "公积金缴纳月份", maxLength = 6)
@ExcelProperty("公积金缴纳月份")
private String providentPayMonth;
@ExcelAttribute(name = "公积金生成月份", maxLength = 6)
@ExcelProperty("公积金生成月份")
private String providentCreateMonth;
@ExcelAttribute(name = "单位社保合计")
@ExcelProperty("单位社保合计")
private BigDecimal unitSocialSum;
@ExcelAttribute(name = "单位公积金合计")
@ExcelProperty("单位公积金合计")
private BigDecimal unitFundSum;
@ExcelAttribute(name = "个人社保合计")
@ExcelProperty("个人社保合计")
private BigDecimal personalSocialSum;
@ExcelAttribute(name = "个人公积金合计")
@ExcelProperty("个人公积金合计")
private BigDecimal personalFundSum;
@ExcelAttribute(name = "费用合计")
@ExcelProperty("费用合计")
private BigDecimal sumAll;
@ExcelAttribute(name = "公积金缴纳地-省", isArea = true)
@ExcelProperty("公积金缴纳地-省")
private String fundProvince;
@ExcelAttribute(name = "公积金缴纳地-市", isArea = true, parentField = "fundProvince")
@ExcelProperty("公积金缴纳地-市")
private String fundCity;
@ExcelAttribute(name = "公积金缴纳地-县", isArea = true, parentField = "fundCity")
@ExcelProperty("公积金缴纳地-县")
private String fundTown;
@ExcelAttribute(name = "社保缴纳地-省", isArea = true)
@ExcelProperty("社保缴纳地-省")
private String socialProvince;
@ExcelAttribute(name = "社保缴纳地-市", isArea = true, parentField = "socialProvince")
@ExcelProperty("社保缴纳地-市")
private String socialCity;
@ExcelAttribute(name = "社保缴纳地-县", isArea = true, parentField = "socialCity")
@ExcelProperty("社保缴纳地-县")
private String socialTown;
@ExcelAttribute(name = "单位养老基数")
@ExcelProperty("单位养老基数")
private BigDecimal unitPensionBase;
@ExcelAttribute(name = "单位医疗基数")
@ExcelProperty("单位医疗基数")
private BigDecimal unitMedicalBase;
@ExcelAttribute(name = "单位失业基数")
@ExcelProperty("单位失业基数")
private BigDecimal unitUnemploymentBase;
@ExcelAttribute(name = "单位工伤基数")
@ExcelProperty("单位工伤基数")
private BigDecimal unitInjuryBase;
@ExcelAttribute(name = "单位生育基数")
@ExcelProperty("单位生育基数")
private BigDecimal unitBirthBase;
@ExcelAttribute(name = "个人养老基数")
@ExcelProperty("个人养老基数")
private BigDecimal personalPensionBase;
@ExcelAttribute(name = "个人医疗基数")
@ExcelProperty("个人医疗基数")
private BigDecimal personalMedicalBase;
@ExcelAttribute(name = "个人失业基数")
@ExcelProperty("个人失业基数")
private BigDecimal personalUnemploymentBase;
@ExcelAttribute(name = "个人大病基数")
@ExcelProperty("个人大病基数")
private BigDecimal personalBigailmentBase;
@ExcelAttribute(name = "单位大病基数")
@ExcelProperty("单位大病基数")
private BigDecimal unitBigailmentBase;
@ExcelAttribute(name = "单位养老比例")
@ExcelProperty("单位养老比例")
private BigDecimal unitPersionPro;
@ExcelAttribute(name = "单位医疗比例")
@ExcelProperty("单位医疗比例")
private BigDecimal unitMedicalPro;
@ExcelAttribute(name = "单位失业比例")
@ExcelProperty("单位失业比例")
private BigDecimal unitUnemploymentPro;
@ExcelAttribute(name = "单位工伤比例")
@ExcelProperty("单位工伤比例")
private BigDecimal unitInjuryPro;
@ExcelAttribute(name = "单位生育比例")
@ExcelProperty("单位生育比例")
private BigDecimal unitBirthPro;
@ExcelAttribute(name = "个人养老比例")
@ExcelProperty("个人养老比例")
private BigDecimal personalPersionPro;
@ExcelAttribute(name = "个人医疗比例")
@ExcelProperty("个人医疗比例")
private BigDecimal personalMedicalPro;
@ExcelAttribute(name = "个人失业比例")
@ExcelProperty("个人失业比例")
private BigDecimal personalUnemploymentPro;
@ExcelAttribute(name = "个人大病比例")
@ExcelProperty("个人大病比例")
private BigDecimal personalBigailmentPro;
@ExcelAttribute(name = "单位大病比例")
@ExcelProperty("单位大病比例")
private BigDecimal unitBigailmentPro;
@ExcelAttribute(name = "单位公积金基数")
@ExcelProperty("单位公积金基数")
private BigDecimal unitFundBase;
@ExcelAttribute(name = "个人公积金基数")
@ExcelProperty("个人公积金基数")
private BigDecimal personalFundBase;
@ExcelAttribute(name = "单位公积金比例")
@ExcelProperty("单位公积金比例")
private BigDecimal unitFundProp;
@ExcelAttribute(name = "个人公积金比例")
@ExcelProperty("个人公积金比例")
private BigDecimal personalFundProp;
@ExcelAttribute(name = "同步状态", readConverterExp = "0=未同步,1=已同步")
@ExcelProperty("同步状态：0未同步；1已同步")
private String dataPush;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty("数据生成时间")
private LocalDateTime createTime;
@ExcelAttribute(name = "数据类型")
@ExcelProperty("数据类型")
private String diffType;
@ExcelAttribute(name = "类型", readConverterExp = "0=社保,1=公积金")
@ExcelProperty("类型")
private Integer dataType;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoSearchVo.java
View file @ 736bffde
......@@ -16,12 +16,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.TPaymentInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
/**
* 缴费库
......@@ -32,28 +34,31 @@ import java.util.List;
@Data
public class TPaymentInfoSearchVo extends TPaymentInfo {
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,id数组")
private List<String> idList;
@Schema(description = "导出的表头的Set")
private Set<String> exportFields;
/**
* 创建时间区间 [开始时间，结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
/**
* 多选导出或删除等操作
*/
@Schema(description = "选中ID,id数组")
private List<String> idList;
/**
* 创建时间区间 [开始时间，结束时间]
*/
@Schema(description = "创建时间区间")
private LocalDateTime[] createTimes;
/**
* @Author fxj
* 查询数据起
**/
@Schema(description = "查询limit 开始")
private int limitStart;
/**
* @Author fxj
* 查询数据止
**/
@Schema(description = "查询limit 数据条数")
private int limitEnd;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchExportVo.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -75,7 +75,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 入职日期
*/
@ExcelAttribute(name = "入职日期")
private Date entryDate;
private String entryDate;
/**
* 正式工资
*/
......@@ -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 @ 736bffde
......@@ -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 @ 736bffde
......@@ -50,8 +50,8 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号")
private String empIdcard;
@ExcelAttribute(name = "缴纳类型", isNotEmpty = true, errorInfo = "缴纳类型必填", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
@ExcelProperty("缴纳类型")
private String paymentType;
......@@ -95,9 +95,9 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
@ExcelProperty("单位公积金基数")
private BigDecimal unitFundBase;
@ExcelAttribute(name = "单位公积金比例")
@Schema(description = "单位公积金比例")
@ExcelProperty("单位公积金比例")
@ExcelAttribute(name = "单位公积金比例（公积金单边比例）")
@Schema(description = "单位公积金比例（公积金单边比例）")
@ExcelProperty("单位公积金比例（公积金单边比例）")
private BigDecimal unitFundProp;
@ExcelAttribute(name = "个人公积金基数")
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialInfoVo.java
View file @ 736bffde
......@@ -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/constants/PreDispatchConstants.java
View file @ 736bffde
......@@ -6,8 +6,6 @@ public class PreDispatchConstants {
public static final String NO_PENSION_AREA_REDUCE = "获取缴纳地数据失败，请检查养老截止城市或公积金截止城市名称是否合规！";
public static final String NO_PENSION_AREA= "请检查派单缴纳地名称是否合规！";
public static final String SOCIAL_START_DATE_ERROR = "社保起缴月份在可补缴月份之前，请确认后操作！";
public static final String NO_SOCIAL_BASE_SET_INFO = "未找到有效的社保基数配置信息（户+缴纳地+起缴时间）！";
......@@ -27,7 +25,6 @@ public class PreDispatchConstants {
"工伤城市","工伤截止时间","生育城市","生育截止时间","失业城市","失业截止时间","公积金城市","公积金截止时间",
"派单分公司","派单客服","小合同名称","合同类型"};
public static final String HAED_ERROR = "请使用标准模板！";
public static final String POSITION = "服务";
public static final String CONTRACT_NAME = "代理社保";
public static final String DISPATCH_TYPE_ERROR = "派单类型有误，0-派增 1-派减！";
......@@ -40,19 +37,14 @@ public class PreDispatchConstants {
public static final String PRESTATUS_ERROR = "‘是否派单’为是且‘预派单状态’为正常未派单才可派单！";
public static final String CITY = "city";
public static final String TOWN = "town";
public static final String SOCIAL_CITY = "social_city";
public static final String SOCIAL_TOWN = "social_town";
public static final String FUND_CITY = "fund_city";
public static final String FUND_TOWN = "fund_town";
public static final String YES_CH = "是";
public static final String NO_CH = "否";
public static final String DATA_CHECK = "数据校验信息：";
public static final String DATA_HANDLE_RESULT = "数据导入结果：";
public static final String DATA_IMPORT_ANALYSIS_ERROR = "数据导入解析失败！";
public static final String IMPORT_PREDISPATCH = "导出预派单";
public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
public static final String TEL_NOT_EMPTY = "联系电话1不可为空！";
public static final String TEL_INVALID = "联系电话1无效！";
public static final String TEL_INVALID2 = "联系电话2无效！";
public static final String GET_AREA_INFO = "获取区域数据失败！";
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TAgentConfigController.java
View file @ 736bffde
......@@ -91,8 +91,8 @@ public class TAgentConfigController {
@SysLog("新增预估临时政策配置表" )
@PostMapping
@PreAuthorize("@pms.hasPermission('social_tagentconfig_add')" )
public R<Boolean> save(@RequestBody TAgentConfig tAgentConfig) {
return R.ok(tAgentConfigService.save(tAgentConfig));
public R save(@RequestBody TAgentConfig tAgentConfig) {
return tAgentConfigService.saveInfo(tAgentConfig);
}
/**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 736bffde
......@@ -127,7 +127,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;
......@@ -144,7 +144,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;
......@@ -233,12 +233,12 @@ public class TDispatchInfoController {
/**
* 派单信息记录表 批量导出
* @author fxj
* @date 2022-07-15 11:38:05
* @author hgw
* @date 2022-7-28 11:01:56
**/
@Operation(description = "导出派单信息记录表 hasPermission('demo_tdispatchinfo-export')")
@Operation(description = "导出派单信息记录表 hasPermission('tdispatchinfo-export')")
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-export')")
@PreAuthorize("@pms.hasPermission('tdispatchinfo-export')")
public void export(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo) {
tDispatchInfoService.listExport(response,searchVo);
}
......@@ -328,7 +328,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;
......@@ -348,7 +348,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/TForecastLibraryController.java
View file @ 736bffde
......@@ -66,19 +66,6 @@ public class TForecastLibraryController {
return new R<>(tForecastLibraryService.getTForecastLibraryPage(page, tForecastLibrary));
}
/**
* 不分页查询
*
* @param tForecastLibrary 预估费用
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage")
//@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_get')" )
public R<List<TForecastLibrary>> getTForecastLibraryNoPage(@RequestBody TForecastLibrary tForecastLibrary) {
return R.ok(tForecastLibraryService.noPageDiy(tForecastLibrary));
}
/**
* 通过id查询预估费用
*
......@@ -160,9 +147,9 @@ public class TForecastLibraryController {
@SysLog("按缴纳月重新生成")
@PostMapping("/createForecastlibary")
@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_create')")
public R<String> createForecastlibary(@RequestParam String payMonths,
@RequestParam(value = "empIdCard", required = false) String empIdCard,
@RequestParam(value = "settleDomainIds", required = false) String settleDomainIds) {
public R<String> createForecastlibary(@RequestParam String payMonths
, @RequestParam(value = "empIdCard", required = false) String empIdCard
, @RequestParam(value = "settleDomainIds", required = false) String settleDomainIds) {
if (Common.isEmpty(empIdCard) && Common.isEmpty(settleDomainIds)) {
return R.failed("参数有误：身份证或项目ID不可为空！");
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @ 736bffde
......@@ -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 @ 736bffde
......@@ -94,7 +94,6 @@ public class TPreDispatchInfoController {
*/
@Operation(summary = "通过id查询", description = "通过id查询：hasPermission('social_tpredispatchinfo_get')")
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_get')" )
public R<TPreDispatchInfo> getById(@PathVariable("id" ) String id) {
return R.ok(tPreDispatchInfoService.getById(id));
}
......@@ -146,12 +145,11 @@ public class TPreDispatchInfoController {
* @param status 0 是 1 否
* @return R
*/
@Operation(summary = "修改资料是否提交", description = "修改资料是否提交：status 0 是 1 否(social_tpredispatchinfo_edit)")
@Operation(summary = "修改资料是否提交", description = "修改资料是否提交：status 0 是 1 否")
@SysLog("修改资料是否提交")
@PostMapping("/modifyDataSubmitStatus")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
public R<Boolean> modifyDataSubmitStatus(@RequestParam(value = "ids",required = true)String ids,
@RequestParam(value = "status",required = true)String status) {
public R<Boolean> modifyDataSubmitStatus(@RequestParam(value = "ids")String ids,
@RequestParam(value = "status")String status) {
return tPreDispatchInfoService.modifyDataSubmitStatus(ids,status);
}
/**
......@@ -165,7 +163,7 @@ public class TPreDispatchInfoController {
@SysLog("清空预派单默认的派单合同信息")
@PostMapping("/clearContractInfo")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
public R<Boolean> clearContractInfo(@RequestParam(value = "ids",required = true)String ids) {
public R<Boolean> clearContractInfo(@RequestParam(value = "ids")String ids) {
return tPreDispatchInfoService.clearContractInfo(ids);
}
......@@ -178,12 +176,11 @@ public class TPreDispatchInfoController {
* @param cancelRemark 不派单 时填写
* @return R
**/
@Operation(summary = "更新预派单是否派单状态", description = "更新预派单是否派单状态(social_tpredispatchinfo_edit)")
@Operation(summary = "更新预派单是否派单状态", description = "更新预派单是否派单状态")
@SysLog("更新预派单是否派单状态")
@PostMapping("/updateDispatchFlag")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
public R<Boolean> updateDispatchFlag(@RequestParam(value = "id",required = true)String id,
@RequestParam(value = "dispatchFlag",required = true)String dispatchFlag,
public R<Boolean> updateDispatchFlag(@RequestParam(value = "id")String id,
@RequestParam(value = "dispatchFlag")String dispatchFlag,
@RequestParam(value = "cancelRemark",required = false)String cancelRemark) {
return tPreDispatchInfoService.updateDispatchFlag(id,dispatchFlag,cancelRemark);
}
......@@ -197,7 +194,8 @@ public class TPreDispatchInfoController {
*/
@Operation(summary = "单个派单:按创建人和ID", description = "单个派单:按创建人和ID")
@PostMapping("/dispatchById")
public R<Boolean> dispatchById(@RequestParam(value = "id",required = true)String id) {
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_dispatch')")
public R<Boolean> dispatchById(@RequestParam(value = "id")String id) {
return tPreDispatchInfoService.dispatchById(id);
}
......@@ -209,6 +207,7 @@ public class TPreDispatchInfoController {
*/
@Operation(summary = "一键派单:按创建人查找正常未派单的数据", description = "一键派单:按创建人查找正常未派单的数据")
@PostMapping("/oneKeyToDispatch")
@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_dispatch')")
public R oneKeyToDispatch(@RequestParam String idStr) {
return tPreDispatchInfoService.oneKeyToDispatch(idStr);
}
......@@ -219,7 +218,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/mapper/TDispatchInfoMapper.java
View file @ 736bffde
......@@ -26,6 +26,8 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleSearchVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -46,6 +48,15 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
*/
IPage<TDispatchInfo> getTDispatchInfoPage(Page<TDispatchInfo> page, @Param("tDispatchInfo") TDispatchInfo tDispatchInfo);
/**
* @Description: 派单导出
* @Author: hgw
* @Date: 2022/7/28 10:45
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo>
**/
List<TDispatchInfoExportVo> exportDispatch(@Param("tDispatchInfo") TDispatchInfoSearchVo tDispatchInfo);
/**
* 导出社保花名册数据查询
* @Author fxj
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @ 736bffde
......@@ -21,9 +21,12 @@ 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.social.entity.TForecastLibrary;
import com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 预估费用
*
......@@ -39,4 +42,13 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
* @return
*/
IPage<TForecastLibrary> getTForecastLibraryPage(Page<TForecastLibrary> page, @Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
/**
* @Description: 导出
* @Author: hgw
* @Date: 2022/7/28 14:52
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryVo>
**/
List<TForecastLibraryExportVo> exportLibrary(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAgentConfigService.java
View file @ 736bffde
......@@ -44,4 +44,11 @@ public interface TAgentConfigService extends IService<TAgentConfig> {
* @return
*/
R updateFlagById(String id);
/**
* 修改开启关闭状态
* @param tAgentConfig 预估临时政策配置表id
* @return
*/
R saveInfo(TAgentConfig tAgentConfig);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @ 736bffde
......@@ -26,7 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import com.yifu.cloud.plus.v1.yifu.social.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.web.bind.annotation.RequestBody;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
......@@ -58,6 +57,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
R<List<ErrorMessage>> importReduceDiy(InputStream inputStream);
@GlobalTransactional
void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList);
R<Boolean> removeByIdDiy(String id);
DispatchDetailVo getSocialAndFundInfoById(String id);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java
View file @ 736bffde
......@@ -26,7 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 预估费用
......@@ -45,11 +44,9 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
void listExport(HttpServletResponse response, TForecastLibrary searchVo);
List<TForecastLibrary> noPageDiy(TForecastLibrary searchVo);
/**
* @param payMonths 缴纳月
* @param empIdCard 身份证
* @param payMonths 缴纳月
* @param empIdCard 身份证
* @param settleDomainIds 项目id
* @Description: 按缴纳月重新生成
* @Author: hgw
......@@ -76,6 +73,15 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
**/
R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo);
/**
* @param socialFundInfo
* @Description: 派单减少变更预估库-派减
* @Author: hgw
* @Date: 2022/7/26 19:02
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R<String> updateForecastLibaryByDispatchReduce(TSocialFundInfo socialFundInfo);
/**
* @Description: 基数变更，同步社保公积金查询、预估库 TODO-加定时器
* @Author: hgw
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAgentConfigServiceImpl.java
View file @ 736bffde
......@@ -16,7 +16,10 @@
*/
package com.yifu.cloud.plus.v1.yifu.social.service.impl;
import cn.hutool.core.util.StrUtil;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
......@@ -69,4 +72,22 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
return R.failed("更新失败！");
}
}
@Override
public R saveInfo(TAgentConfig tAgentConfig) {
LambdaQueryWrapper<TAgentConfig> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TAgentConfig::getYear, tAgentConfig.getYear());
wrapper.eq(TAgentConfig::getTarget, tAgentConfig.getTarget());
if (Common.isNotNull(tAgentConfig.getCity())){
wrapper.eq(TAgentConfig::getCity,tAgentConfig.getCity());
} else {
wrapper.eq(TAgentConfig::getProvince,tAgentConfig.getProvince());
}
wrapper.last(CommonConstants.LAST_ONE_SQL);
TAgentConfig count = baseMapper.selectOne(wrapper);
if (Common.isNotNull(count)) {
return R.failed("同一城市，年度的政策不能重复新增");
}
return R.ok();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ 736bffde
......@@ -138,7 +138,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
response.setCharacterEncoding("utf-8");
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
ExcelWriter excelWriter = EasyExcel.write(out, TPaymentInfo.class).build();
ExcelWriter excelWriter = EasyExcel.write(out, TPaymentInfo.class).includeColumnFiledNames(searchVo.getExportFields()).build();;
int index = 0;
if (count > CommonConstants.ZERO_INT) {
for (int i = 0; i <= count; ) {
......
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