Commit bbaf00a2 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 65dcb3fe
...@@ -178,6 +178,9 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -178,6 +178,9 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "购买补充保险说明") @Schema(description = "购买补充保险说明")
private String riskBuyDesc; private String riskBuyDesc;
@Schema(description = "业务细分")
private String contractSubName;
@Schema(description = "其他 (工资形式其他时的工资)") @Schema(description = "其他 (工资形式其他时的工资)")
private String otherWage; private String otherWage;
...@@ -261,7 +264,7 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -261,7 +264,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "新合同发起时间 入职日期 0、入职3天后 3、入职1周后 7、入职2周后 14、入职3周后 21") @Schema(description = "新合同发起时间 入职日期 0、入职3天后 3、入职1周后 7、入职2周后 14、入职3周后 21")
@TableField(exist = false) @TableField(exist = false)
private int registType; private String registType;
@Schema(description = "试用期月份数字 1、2、3、4...") @Schema(description = "试用期月份数字 1、2、3、4...")
@TableField(exist = false) @TableField(exist = false)
......
...@@ -88,7 +88,14 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -88,7 +88,14 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "新合同发起时间") @ExcelAttribute(name = "新合同发起时间")
@Schema(description = "新合同发起时间 入职日期 0、入职3天后 3、入职1周后 7、入职2周后 14、入职3周后 21") @Schema(description = "新合同发起时间 入职日期 0、入职3天后 3、入职1周后 7、入职2周后 14、入职3周后 21")
@ExcelProperty("新合同发起时间") @ExcelProperty("新合同发起时间")
private int registType; private String registType;
/**
* 业务细分
*/
@ExcelAttribute(name = "业务细分")
@Schema(description = "业务细分(存lable)")
private String contractSubName;
/** /**
* 合同类型 * 合同类型
*/ */
......
...@@ -219,7 +219,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -219,7 +219,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 档案信息修改 // 档案信息修改
TEmployeePreLogDetail detailEmpLog = null; TEmployeePreLogDetail detailEmpLog = null;
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey) if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)
&& !"employeeContractPre".equals(differenceKey)) { && !"attaIdList".equals(differenceKey) && !"employeeContractPre".equals(differenceKey)) {
differenceKey = differenceKey.replace("insurancePreList",""); differenceKey = differenceKey.replace("insurancePreList","");
differenceKey = differenceKey.replace("employeeContractPre",""); differenceKey = differenceKey.replace("employeeContractPre","");
diffTitle = "档案信息"; diffTitle = "档案信息";
...@@ -392,8 +392,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -392,8 +392,9 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
TEmployeePreLogDetail detailEmpLog = null; TEmployeePreLogDetail detailEmpLog = null;
if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey) if (Common.isNotNull(differenceKey) && !"insurancePreList".equals(differenceKey)
&& !"attaIdList".equals(differenceKey)) { && !"attaIdList".equals(differenceKey) && !"employeeContractPre".equals(differenceKey)) {
differenceKey = differenceKey.replace("insurancePreList",""); differenceKey = differenceKey.replace("insurancePreList","");
differenceKey = differenceKey.replace("employeeContractPre","");
diffTitle = "档案信息二次确认"; diffTitle = "档案信息二次确认";
detailEmpLog = new TEmployeePreLogDetail(); detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.TWO_STRING); detailEmpLog.setModelType(CommonConstants.TWO_STRING);
......
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<result property="createName" column="create_name"/> <result property="createName" column="create_name"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/> <result property="updateBy" column="update_by"/>
<result property="contractSubName" column="CONTRACT_SUB_NAME,"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
...@@ -163,7 +164,7 @@ ...@@ -163,7 +164,7 @@
,update_by ,update_by
,TASK ,TASK
,TASK_TYPE ,TASK_TYPE
,TASK_END_STANDARD,contract_flag ,TASK_END_STANDARD,contract_flag,a.CONTRACT_SUB_NAME,
</sql> </sql>
<sql id="tEmployeeContractPre_where"> <sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null"> <if test="tEmployeeContractPre != null">
...@@ -334,7 +335,7 @@ ...@@ -334,7 +335,7 @@
a.dept_no deptNo, a.dept_no deptNo,
a.situation, a.situation,
a.contract_type contractName, a.contract_type contractName,
null contractSubName, a.CONTRACT_SUB_NAME contractSubName,
null reason, null reason,
a.signatory contractParty, a.signatory contractParty,
if(a.CONTRACT_TERM = '' or a.CONTRACT_TERM is null,'2',a.CONTRACT_TERM) contractType, if(a.CONTRACT_TERM = '' or a.CONTRACT_TERM is null,'2',a.CONTRACT_TERM) contractType,
......
...@@ -719,7 +719,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -719,7 +719,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.TWO_STRING); dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(registration.getJoinLeaveDate()); dayVo.setRegistDate(registration.getJoinLeaveDate());
dayVo.setRegistType(employeeContractPreVo.getRegistType()); dayVo.setRegistType(Integer.parseInt(employeeContractPreVo.getRegistType()));
dataR = socialDaprUtils.getContractAfterWorkDay(dayVo); dataR = socialDaprUtils.getContractAfterWorkDay(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData()) if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())) { && Common.isNotNull(dataR.getData().getRegistDate())) {
......
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