Commit 6a2f2440 authored by 李灿灿's avatar 李灿灿

Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!31
parents 21a2327f a4b721e5
...@@ -60,10 +60,6 @@ public class InsurancesConstants { ...@@ -60,10 +60,6 @@ public class InsurancesConstants {
* 无效、已过期、已出险、已减员的 不能替换 * 无效、已过期、已出险、已减员的 不能替换
*/ */
public static final String REPLACE_IS_NOT_ALLOW = "无效、已过期、已出险、已减员的 不能替换"; public static final String REPLACE_IS_NOT_ALLOW = "无效、已过期、已出险、已减员的 不能替换";
/**
* 订单编号不能为空
*/
public static final String ORDER_NO_NOT_EMPTY = "订单编号不能为空";
/** /**
* 员工姓名不能为空 * 员工姓名不能为空
*/ */
......
...@@ -42,12 +42,6 @@ public class TInsuranceDetail extends BaseEntity { ...@@ -42,12 +42,6 @@ public class TInsuranceDetail extends BaseEntity {
@Schema(description = "员工身份证号") @Schema(description = "员工身份证号")
private String empIdcardNo; private String empIdcardNo;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 项目编码 * 项目编码
*/ */
......
...@@ -14,11 +14,6 @@ import java.io.Serializable; ...@@ -14,11 +14,6 @@ import java.io.Serializable;
@Schema(description = "商险办理新增入参") @Schema(description = "商险办理新增入参")
public class InsuranceAddParam implements Serializable { public class InsuranceAddParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L; private static final long serialVersionUID = -2689686777914935788L;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 员工姓名 * 员工姓名
......
...@@ -16,11 +16,6 @@ import java.time.LocalDate; ...@@ -16,11 +16,6 @@ import java.time.LocalDate;
@Schema(description = "商险办理批增入参") @Schema(description = "商险办理批增入参")
public class InsuranceBatchParam implements Serializable { public class InsuranceBatchParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L; private static final long serialVersionUID = -2689686777914935788L;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 项目编码 * 项目编码
......
...@@ -22,12 +22,6 @@ public class InsuranceExportListVO implements Serializable { ...@@ -22,12 +22,6 @@ public class InsuranceExportListVO implements Serializable {
*/ */
private String id; private String id;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 项目名称 * 项目名称
*/ */
......
...@@ -24,12 +24,6 @@ public class InsuranceListVO implements Serializable { ...@@ -24,12 +24,6 @@ public class InsuranceListVO implements Serializable {
@Schema(description = "主键") @Schema(description = "主键")
private String id; private String id;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 员工姓名 * 员工姓名
*/ */
......
...@@ -24,12 +24,6 @@ public class InsuranceRefundHandlingListVo implements Serializable { ...@@ -24,12 +24,6 @@ public class InsuranceRefundHandlingListVo implements Serializable {
*/ */
private String id; private String id;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 项目名称 * 项目名称
*/ */
......
...@@ -24,12 +24,6 @@ public class InsuranceRefundListVo implements Serializable { ...@@ -24,12 +24,6 @@ public class InsuranceRefundListVo implements Serializable {
@Schema(description = "主键") @Schema(description = "主键")
private String id; private String id;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 项目名称 * 项目名称
*/ */
......
...@@ -74,12 +74,6 @@ public class InsuranceReplaceParam implements Serializable { ...@@ -74,12 +74,6 @@ public class InsuranceReplaceParam implements Serializable {
@Schema(description = "替换员工项目编码") @Schema(description = "替换员工项目编码")
private String replaceDeptNo; private String replaceDeptNo;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 岗位 * 岗位
*/ */
......
...@@ -30,12 +30,6 @@ public class InsuredListVo implements Serializable { ...@@ -30,12 +30,6 @@ public class InsuredListVo implements Serializable {
@Schema(description = "主键") @Schema(description = "主键")
private String id; private String id;
/**
* 订单编号
*/
@Schema(description = "订单编号")
private String orderNo;
/** /**
* 员工姓名 * 员工姓名
*/ */
......
...@@ -257,7 +257,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -257,7 +257,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail.setEmpName(success.getReplaceEmpName()); newDetail.setEmpName(success.getReplaceEmpName());
newDetail.setEmpIdcardNo(success.getReplaceEmpIdcardNo()); newDetail.setEmpIdcardNo(success.getReplaceEmpIdcardNo());
newDetail.setDeptNo(success.getReplaceDeptNo()); newDetail.setDeptNo(success.getReplaceDeptNo());
newDetail.setOrderNo(success.getOrderNo());
newDetail.setPost(success.getPost()); newDetail.setPost(success.getPost());
Boolean insert = this.save(newDetail); Boolean insert = this.save(newDetail);
//替换记录 //替换记录
...@@ -597,11 +596,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -597,11 +596,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceAddParam> listSuccess = new ArrayList<>(); List<InsuranceAddParam> listSuccess = new ArrayList<>();
for (InsuranceAddParam param : paramList) { for (InsuranceAddParam param : paramList) {
// 必填校验 // 必填校验
if (StringUtils.isBlank(param.getOrderNo())){
param.setErrorMessage(InsurancesConstants.ORDER_NO_NOT_EMPTY);
listResult.add(param);
continue;
}
if (StringUtils.isBlank(param.getEmpName())){ if (StringUtils.isBlank(param.getEmpName())){
param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY); param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
listResult.add(param); listResult.add(param);
...@@ -847,11 +841,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -847,11 +841,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceBatchParam> listSuccess = new ArrayList<>(); List<InsuranceBatchParam> listSuccess = new ArrayList<>();
for (InsuranceBatchParam param : paramList) { for (InsuranceBatchParam param : paramList) {
// 必填校验 // 必填校验
if (StringUtils.isBlank(param.getOrderNo())){
param.setErrorMessage(InsurancesConstants.ORDER_NO_NOT_EMPTY);
listResult.add(param);
continue;
}
if (StringUtils.isBlank(param.getDeptNo())){ if (StringUtils.isBlank(param.getDeptNo())){
param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_EMPTY); param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_EMPTY);
listResult.add(param); listResult.add(param);
...@@ -1137,11 +1126,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1137,11 +1126,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param); listResult.add(param);
continue; continue;
} }
if (StringUtils.isBlank(param.getOrderNo())){
param.setErrorMessage(InsurancesConstants.ORDER_NO_NOT_EMPTY);
listResult.add(param);
continue;
}
if (StringUtils.isBlank(param.getPost())){ if (StringUtils.isBlank(param.getPost())){
param.setErrorMessage(InsurancesConstants.POST_NOT_EMPTY); param.setErrorMessage(InsurancesConstants.POST_NOT_EMPTY);
listResult.add(param); listResult.add(param);
......
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