Commit 242afb10 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent 027a09b1
...@@ -1455,13 +1455,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1455,13 +1455,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} else { } else {
insert.setEmpId(project.getEmpId()); insert.setEmpId(project.getEmpId());
insert.setSettleDomain(project.getDeptId()); insert.setSettleDomain(project.getDeptId());
//电子签更新为签署中 // 批量直接待审核
if (Common.isNotNull(insert.getSignType()) && "0".equals(insert.getSignType())) { insert.setAuditStatus(CommonConstants.ONE_INT);
insert.setAuditStatus(CommonConstants.FOUR_INT);
} else {
// 批量直接待审核
insert.setAuditStatus(CommonConstants.ONE_INT);
}
if (Common.isEmpty(insert.getContractTerm()) if (Common.isEmpty(insert.getContractTerm())
&& Common.isNotNull(insert.getContractStart()) && Common.isNotNull(insert.getContractStart())
&& Common.isNotNull(insert.getContractEnd())) { && Common.isNotNull(insert.getContractEnd())) {
......
...@@ -60,4 +60,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre { ...@@ -60,4 +60,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@Schema(description = "自动标识 1不查询确认时间为空的数据") @Schema(description = "自动标识 1不查询确认时间为空的数据")
private String autoSendFlag; private String autoSendFlag;
@Schema(description = "自动标识 1查询派单时间为空或者当天之前的数据")
private String timeSendFlag;
} }
...@@ -240,6 +240,10 @@ ...@@ -240,6 +240,10 @@
<if test="tDispatchInfoPre.autoSendFlag != null and tDispatchInfoPre.autoSendFlag.trim() != ''"> <if test="tDispatchInfoPre.autoSendFlag != null and tDispatchInfoPre.autoSendFlag.trim() != ''">
AND a.EXPECTED_CONFIRM_TIME is not null and DATE_FORMAT(a.EXPECTED_CONFIRM_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> CURDATE() AND a.EXPECTED_CONFIRM_TIME is not null and DATE_FORMAT(a.EXPECTED_CONFIRM_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> CURDATE()
</if> </if>
<if test="tDispatchInfoPre.timeSendFlag != null and tDispatchInfoPre.timeSendFlag.trim() != ''">
AND (a.EXPECTED_COLLECTION_TIME is null or
DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> CURDATE() )
</if>
<if test="tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"> <if test="tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''">
${tDispatchInfoPre.authSql} ${tDispatchInfoPre.authSql}
</if> </if>
......
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