Commit 48794bfc authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent 1f903468
...@@ -59,6 +59,14 @@ public class TElectronicArchiveDetail extends BaseEntity { ...@@ -59,6 +59,14 @@ public class TElectronicArchiveDetail extends BaseEntity {
@Schema(description = "项目编码") @Schema(description = "项目编码")
private String deptNo; private String deptNo;
/**
* 项目ID
*/
@ExcelAttribute(name = "项目ID")
@ExcelProperty("项目ID")
@Schema(description = "项目ID")
private String deptId;
/** /**
* 项目名称 * 项目名称
*/ */
......
...@@ -261,6 +261,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -261,6 +261,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
detail.setEmpName(data.getEmpName()); detail.setEmpName(data.getEmpName());
detail.setEmpIdcard(data.getEmpIdcard()); detail.setEmpIdcard(data.getEmpIdcard());
detail.setDeptNo(data.getDeptNo()); detail.setDeptNo(data.getDeptNo());
detail.setDeptId(settleResult.getId());
detail.setDeptName(data.getDeptName()); detail.setDeptName(data.getDeptName());
detail.setCustomerName(settleResult.getCustomerName()); detail.setCustomerName(settleResult.getCustomerName());
detail.setCustomerCode(settleResult.getCustomerCode()); detail.setCustomerCode(settleResult.getCustomerCode());
...@@ -1346,6 +1347,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -1346,6 +1347,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
detail.setEmpIdcard(empIdcard); detail.setEmpIdcard(empIdcard);
detail.setDeptNo(deptNo); detail.setDeptNo(deptNo);
detail.setDeptName(deptName); detail.setDeptName(deptName);
detail.setDeptId(settleResult.getId());
detail.setCustomerName(settleResult.getCustomerName()); detail.setCustomerName(settleResult.getCustomerName());
detail.setCustomerCode(settleResult.getCustomerCode()); detail.setCustomerCode(settleResult.getCustomerCode());
detail.setMaterialType(materialType); detail.setMaterialType(materialType);
...@@ -1498,6 +1500,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo ...@@ -1498,6 +1500,7 @@ public class ElectronicArchiveImportServiceImpl implements ElectronicArchiveImpo
detail.setEmpIdcard(empIdcard); detail.setEmpIdcard(empIdcard);
detail.setDeptNo(deptNo); detail.setDeptNo(deptNo);
detail.setDeptName(deptName); detail.setDeptName(deptName);
detail.setDeptId(settleResult.getId());
detail.setCustomerName(settleResult.getCustomerName()); detail.setCustomerName(settleResult.getCustomerName());
detail.setCustomerCode(settleResult.getCustomerCode()); detail.setCustomerCode(settleResult.getCustomerCode());
detail.setMaterialType(materialType); detail.setMaterialType(materialType);
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<result property="updateBy" column="UPDATE_BY"/> <result property="updateBy" column="UPDATE_BY"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="fileAddress" column="FILE_ADDRESS"/> <result property="fileAddress" column="FILE_ADDRESS"/>
<result property="deptId" column="DEPT_ID"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -44,7 +45,8 @@ ...@@ -44,7 +45,8 @@
a.CREATE_TIME, a.CREATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.UPDATE_TIME, a.UPDATE_TIME,
a.FILE_ADDRESS a.FILE_ADDRESS,
a.DEPT_ID
</sql> </sql>
<sql id="tElectronicArchiveDetail_where"> <sql id="tElectronicArchiveDetail_where">
<if test="tElectronicArchiveDetail != null"> <if test="tElectronicArchiveDetail != null">
......
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