Commit 1d68c243 authored by fangxinjiang's avatar fangxinjiang

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

parents 43e45c53 97715782
...@@ -23,40 +23,41 @@ public class ArchiveImportVO extends RowIndex implements Serializable { ...@@ -23,40 +23,41 @@ public class ArchiveImportVO extends RowIndex implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 姓名
*/
@ExcelAttribute(name = "姓名", isNotEmpty = true, errorInfo = "姓名不能为空", maxLength = 32)
@ExcelProperty(value = "姓名")
@NotBlank(message = "姓名不能为空")
@Schema(description = "姓名")
private String empName;
/** /**
* 身份证号码 * 身份证号码
*/ */
@ExcelAttribute(name = "身份证号码", isNotEmpty = true, errorInfo = "身份证号码不能为空", maxLength = 18) @ExcelAttribute(name = "身份证号码", isNotEmpty = true, errorInfo = "身份证号码不能为空", maxLength = 18)
@ExcelProperty(value = "身份证号码", index = 0) @ExcelProperty(value = "身份证号码")
@NotBlank(message = "身份证号码不能为空") @NotBlank(message = "身份证号码不能为空")
@Schema(description = "身份证号码") @Schema(description = "身份证号码")
private String empIdcard; private String empIdcard;
/** /**
* 姓名 * 项目名称
*/ */
@ExcelAttribute(name = "姓名", isNotEmpty = true, errorInfo = "姓名不能为空", maxLength = 32) @ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目名称不能为空", maxLength = 50)
@ExcelProperty(value = "姓名", index = 1) @ExcelProperty(value = "项目名称")
@NotBlank(message = "姓名不能为空") @NotBlank(message = "项目名称不能为空")
@Schema(description = "姓名") @Schema(description = "项目名称")
private String empName; private String deptName;
/** /**
* 项目编码 * 项目编码
*/ */
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 50) @ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 50)
@ExcelProperty(value = "项目编码", index = 2) @ExcelProperty(value = "项目编码")
@NotBlank(message = "项目编码不能为空") @NotBlank(message = "项目编码不能为空")
@Schema(description = "项目编码") @Schema(description = "项目编码")
private String deptNo; private String deptNo;
/**
* 项目名称
*/
@ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目名称不能为空", maxLength = 50)
@ExcelProperty(value = "项目名称", index = 3)
@NotBlank(message = "项目名称不能为空")
@Schema(description = "项目名称")
private String deptName;
} }
...@@ -214,7 +214,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -214,7 +214,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
} }
} }
// 1. 校验表格中一个姓名、身份证只能有一条 // 1. 校验表格中一个姓名、身份证只能有一条
String uniqueKey = data.getEmpIdcard() + "_" + data.getEmpName() + "_" + data.getDeptNo(); String uniqueKey = data.getEmpIdcard() + "_" + data.getEmpName();
if (null != map.get(uniqueKey)) { if (null != map.get(uniqueKey)) {
ErrorMessage<ArchiveImportVO> errorMessage = new ErrorMessage<>(data.getRowIndex() ErrorMessage<ArchiveImportVO> errorMessage = new ErrorMessage<>(data.getRowIndex()
,"第" + data.getRowIndex() + "行:姓名和身份证信息存在重复数据",data); ,"第" + data.getRowIndex() + "行:姓名和身份证信息存在重复数据",data);
...@@ -226,7 +226,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -226,7 +226,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
// 查询项目信息获取客户信息 // 查询项目信息获取客户信息
settleResult = archivesDaprUtil.selectDeptByNo(data.getDeptNo()); settleResult = archivesDaprUtil.selectDeptByNo(data.getDeptNo());
if (settleResult == null) { if (Common.isEmpty(settleResult) || Common.isEmpty(settleResult.getCustomerCode())) {
ErrorMessage<ArchiveImportVO> errorMessage = new ErrorMessage<>(data.getRowIndex() ErrorMessage<ArchiveImportVO> errorMessage = new ErrorMessage<>(data.getRowIndex()
,"第" + data.getRowIndex() + "行:项目编码[" + data.getDeptNo() + "]信息不存在",data); ,"第" + data.getRowIndex() + "行:项目编码[" + data.getDeptNo() + "]信息不存在",data);
errorMessageList.add(errorMessage); errorMessageList.add(errorMessage);
...@@ -262,7 +262,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -262,7 +262,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
detail.setEmpIdcard(data.getEmpIdcard()); detail.setEmpIdcard(data.getEmpIdcard());
detail.setDeptNo(data.getDeptNo()); detail.setDeptNo(data.getDeptNo());
detail.setDeptId(settleResult.getId()); detail.setDeptId(settleResult.getId());
detail.setDeptName(data.getDeptName()); detail.setDeptName(settleResult.getDepartName());
detail.setCustomerName(settleResult.getCustomerName()); detail.setCustomerName(settleResult.getCustomerName());
detail.setCustomerCode(settleResult.getCustomerCode()); detail.setCustomerCode(settleResult.getCustomerCode());
detail.setMaterialType(""); // 初始为空,第三步处理时填充 detail.setMaterialType(""); // 初始为空,第三步处理时填充
...@@ -1356,7 +1356,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -1356,7 +1356,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
detail.setEmpName(empName); detail.setEmpName(empName);
detail.setEmpIdcard(empIdcard); detail.setEmpIdcard(empIdcard);
detail.setDeptNo(deptNo); detail.setDeptNo(deptNo);
detail.setDeptName(deptName); detail.setDeptName(settleResult.getDepartName());
detail.setDeptId(settleResult.getId()); detail.setDeptId(settleResult.getId());
detail.setCustomerName(settleResult.getCustomerName()); detail.setCustomerName(settleResult.getCustomerName());
detail.setCustomerCode(settleResult.getCustomerCode()); detail.setCustomerCode(settleResult.getCustomerCode());
...@@ -1509,7 +1509,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -1509,7 +1509,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
detail.setEmpName(empName); detail.setEmpName(empName);
detail.setEmpIdcard(empIdcard); detail.setEmpIdcard(empIdcard);
detail.setDeptNo(deptNo); detail.setDeptNo(deptNo);
detail.setDeptName(deptName); detail.setDeptName(settleResult.getDepartName());
detail.setDeptId(settleResult.getId()); detail.setDeptId(settleResult.getId());
detail.setCustomerName(settleResult.getCustomerName()); detail.setCustomerName(settleResult.getCustomerName());
detail.setCustomerCode(settleResult.getCustomerCode()); detail.setCustomerCode(settleResult.getCustomerCode());
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_electronic_archive_detail a FROM t_electronic_archive_detail a
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0' and a.STATUS = '1'
<include refid="tElectronicArchiveDetail_where"/> <include refid="tElectronicArchiveDetail_where"/>
</where> </where>
ORDER BY a.CREATE_TIME DESC ORDER BY a.CREATE_TIME DESC
......
...@@ -649,11 +649,12 @@ ...@@ -649,11 +649,12 @@
a.INSURANCE_CITY_NAME as insuranceCityName a.INSURANCE_CITY_NAME as insuranceCityName
from from
t_insurance_detail a t_insurance_detail a
left join t_employee_insurance_pre b on a.id = b.insurances_id
where where
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0)) and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0))
AND EMP_IDCARD_NO = #{empIdCard} AND EMP_IDCARD_NO = #{empIdCard} and b.id is null
and a.create_name not like '自动化%' group by a.id
</select> </select>
<!-- ***********************减员办理******************************** --> <!-- ***********************减员办理******************************** -->
......
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