Commit c4e4631b authored by fangxinjiang's avatar fangxinjiang

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

parents 6d1e122b 3b9f5414
...@@ -46,7 +46,7 @@ spec: # 资源规范字段 ...@@ -46,7 +46,7 @@ spec: # 资源规范字段
- name: yifu-insurances # 容器的名字 - name: yifu-insurances # 容器的名字
image: localhost:5000/qas-mvp/yifu-insurances-biz:1.0.0 #临时地址 image: localhost:5000/qas-mvp/yifu-insurances-biz:1.0.0 #临时地址
# image: 192.168.1.110:5500/qas-mvp/yifu-insurances-biz:1.0.0 # 容器镜像地址 # image: 192.168.1.110:5500/qas-mvp/yifu-insurances-biz:1.0.0 # 容器镜像地址
imagePullPolicy: IfNotPresent # 每次Pod启动拉取镜像策略,三个选择 Always、Never、IfNotPresent imagePullPolicy: Always # 每次Pod启动拉取镜像策略,三个选择 Always、Never、IfNotPresent
# Always,每次都检查;Never,每次都不检查(不管本地是否有);IfNotPresent,如果本地有就不检查,如果没有就拉取(手动测试时, # Always,每次都检查;Never,每次都不检查(不管本地是否有);IfNotPresent,如果本地有就不检查,如果没有就拉取(手动测试时,
# 已经打好镜像存在docker容器中时,使用存在不检查级别, # 已经打好镜像存在docker容器中时,使用存在不检查级别,
# 默认为每次都检查,然后会进行拉取新镜像,因镜像仓库不存在,导致部署失败) # 默认为每次都检查,然后会进行拉取新镜像,因镜像仓库不存在,导致部署失败)
......
...@@ -588,10 +588,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -588,10 +588,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//档案柜存在就自动归档 //档案柜存在就自动归档
if (Common.isNotNull(tEmployeeContractInfo.getAttaList())) { if (Common.isNotNull(tEmployeeContractInfo.getAttaList())) {
this.updateFileMainId(tEmployeeContractInfo); this.updateFileMainId(tEmployeeContractInfo);
this.setFileInfo(tEmployeeContractInfo.getId(), "添加附件"); this.setFileInfo(tEmployeeContractInfo.getId(), "");
tEmployeeContractInfo.setIsFile(CommonConstants.ZERO_STRING); tEmployeeContractInfo.setIsFile(CommonConstants.ZERO_STRING);
} else { } else {
this.setFileInfo(tEmployeeContractInfo.getId(), "清空附件"); this.setFileInfo(tEmployeeContractInfo.getId(), "");
tEmployeeContractInfo.setIsFile(CommonConstants.ONE_STRING); tEmployeeContractInfo.setIsFile(CommonConstants.ONE_STRING);
} }
this.updateById(tEmployeeContractInfo); this.updateById(tEmployeeContractInfo);
......
...@@ -110,28 +110,28 @@ public class TSalaryAccount { ...@@ -110,28 +110,28 @@ public class TSalaryAccount {
@ExcelProperty("开户行总行") @ExcelProperty("开户行总行")
private String bankName; private String bankName;
/** /**
* 结算部门id * 项目id
*/ */
@ExcelAttribute(name = "结算部门id", isNotEmpty = true, errorInfo = "结算部门id不能为空", maxLength = 32) @ExcelAttribute(name = "项目id", isNotEmpty = true, errorInfo = "项目id不能为空", maxLength = 32)
@NotBlank(message = "结算部门id不能为空") @NotBlank(message = "项目id不能为空")
@Length(max = 32, message = "结算部门id不能超过32个字符") @Length(max = 32, message = "项目id不能超过32个字符")
@ExcelProperty("结算部门id") @ExcelProperty("项目id")
private String deptId; private String deptId;
/** /**
* 结算部门no * 项目no
*/ */
@ExcelAttribute(name = "结算部门no", isNotEmpty = true, errorInfo = "结算部门no不能为空", maxLength = 50) @ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目no不能为空", maxLength = 50)
@NotBlank(message = "结算部门no不能为空") @NotBlank(message = "项目编码不能为空")
@Length(max = 50, message = "结算部门no不能超过50个字符") @Length(max = 50, message = "项目编码不能超过50个字符")
@ExcelProperty("结算部门no") @ExcelProperty("项目编码")
private String deptNo; private String deptNo;
/** /**
* 结算部门name * 项目name
*/ */
@ExcelAttribute(name = "结算部门name", isNotEmpty = true, errorInfo = "结算部门name不能为空", maxLength = 50) @ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目name不能为空", maxLength = 50)
@NotBlank(message = "结算部门name不能为空") @NotBlank(message = "项目名称不能为空")
@Length(max = 50, message = "结算部门name不能超过50个字符") @Length(max = 50, message = "项目名称不能超过50个字符")
@ExcelProperty("结算部门name") @ExcelProperty("项目名称")
private String deptName; private String deptName;
/** /**
* 工资发放方式(0现金/1银行)/2线下 * 工资发放方式(0现金/1银行)/2线下
......
...@@ -210,27 +210,27 @@ public class SalaryAccountUtil implements Serializable { ...@@ -210,27 +210,27 @@ public class SalaryAccountUtil implements Serializable {
} }
field = fieldsMap.get(scs.getJavaFiedName()); field = fieldsMap.get(scs.getJavaFiedName());
if (field == null) { if (field == null) {
sai = new TSalaryAccountItemVo();
sai.setCnName(dbFiedName);
sai.setJavaFiedName(scs.getJavaFiedName());
if (scs.getIsTax() != null) {
sai.setIsTax(scs.getIsTax());
} else {
sai.setIsTax(CommonConstants.ZERO_INT);
}
try { try {
cellValueBig = new BigDecimal(cellValueStr); cellValueBig = new BigDecimal(cellValueStr);
cellValueBig = cellValueBig.setScale(2, BigDecimal.ROUND_HALF_UP); //四舍五入 cellValueBig = cellValueBig.setScale(2, BigDecimal.ROUND_HALF_UP); //四舍五入
if (cellValueBig.toString().length() > 11) { if (cellValueBig.toString().length() > 11) {
error = "第" + (i + 2) + "行金额太大了,请检查一下:" + cellValueBig; sai.setTextValue(cellValueBig.toString());
errorList.add(new ErrorMessage((i + 2), error));
break;
}
sai = new TSalaryAccountItemVo();
sai.setCnName(dbFiedName);
sai.setJavaFiedName(scs.getJavaFiedName());
sai.setSalaryMoney(cellValueBig);
if (scs.getIsTax() != null) {
sai.setIsTax(scs.getIsTax());
} else { } else {
sai.setIsTax(CommonConstants.ZERO_INT); sai.setSalaryMoney(cellValueBig);
} }
saiList.add(sai);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
sai.setTextValue(cellValueStr);
//非数字,不保存 //非数字,不保存
} }
saiList.add(sai);
} else { } else {
attr = field.getAnnotation(ExcelAttribute.class); attr = field.getAnnotation(ExcelAttribute.class);
error = validateUtil(cellValueStr, attr, (i + 2)); error = validateUtil(cellValueStr, attr, (i + 2));
......
...@@ -1043,4 +1043,9 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -1043,4 +1043,9 @@ public class TSocialFundInfo extends BaseEntity {
// 执行月份,整体调基使用的 // 执行月份,整体调基使用的
@TableField(exist = false) @TableField(exist = false)
private String doMonth; private String doMonth;
// 基数配置,户调基使用的
@TableField(exist = false)
private SysBaseSetInfo socialSetInfo;
@TableField(exist = false)
private SysBaseSetInfo fundSetInfo;
} }
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