Commit 423e668b authored by hongguangwu's avatar hongguangwu

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

parents ddb6ca9b 57044506
...@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; ...@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
/** /**
...@@ -577,4 +578,7 @@ public class TGzEmpInfo extends BaseEntity { ...@@ -577,4 +578,7 @@ public class TGzEmpInfo extends BaseEntity {
@Schema(description = "档案状态(0:已提交,1:暂存)") @Schema(description = "档案状态(0:已提交,1:暂存)")
private String empStatus; private String empStatus;
@Schema(description = "档案提交时间")
private LocalDateTime submitTime;
} }
...@@ -589,7 +589,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -589,7 +589,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
employeeRegistrationPre.setInsurancePreList(newList); employeeRegistrationPre.setInsurancePreList(newList);
} }
} else { } else if (employeeRegistrationPre.getInsuranceIsBuy().equals(CommonConstants.ONE_STRING)) {
if (employeeRegistrationPre.getInsurancePreList() == null if (employeeRegistrationPre.getInsurancePreList() == null
|| employeeRegistrationPre.getInsurancePreList().isEmpty()) { || employeeRegistrationPre.getInsurancePreList().isEmpty()) {
return R.failed("含商险服务,商险配置不可为空"); return R.failed("含商险服务,商险配置不可为空");
......
...@@ -263,8 +263,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -263,8 +263,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailList.add(detailInsuranceLog); detailList.add(detailInsuranceLog);
} }
//如果服务类型包含商险处理商险明细数据 //如果服务类型包含商险处理商险明细数据
if (Common.isNotNull(newInfo.getServerItem()) && newInfo.getServerItem().contains("商险")) {
newInfo.setId(empPreId); newInfo.setId(empPreId);
if (Common.isNotNull(newInfo.getServerItem()) && newInfo.getServerItem().contains("商险")) {
if (!newInfo.getExitInsuranceInfoList().isEmpty()) { if (!newInfo.getExitInsuranceInfoList().isEmpty()) {
newInfo.getExitInsuranceInfoList().forEach(insurancePreVo -> insurancePreVo.setRegisterId(empPreId)); newInfo.getExitInsuranceInfoList().forEach(insurancePreVo -> insurancePreVo.setRegisterId(empPreId));
} }
...@@ -272,6 +272,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -272,6 +272,13 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
, "/temployeeinsurancepre/inner/updateInfoSaveInsurancePreInfo" , "/temployeeinsurancepre/inner/updateInfoSaveInsurancePreInfo"
, newInfo, Boolean.class, SecurityConstants.FROM_IN); , newInfo, Boolean.class, SecurityConstants.FROM_IN);
} }
//如果服务类型不包含商险删除商险明细数据
if (Common.isNotNull(newInfo.getServerItem()) && !newInfo.getServerItem().contains("商险")) {
HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(), daprInsurancesProperties.getAppId()
, "/temployeeinsurancepre/inner/deleteInsurancePreInfo"
, newInfo, Boolean.class, SecurityConstants.FROM_IN);
}
if (newList != null && !newList.isEmpty()) { if (newList != null && !newList.isEmpty()) {
for (TEmployeeInsurancePre newInsurance : newList) { for (TEmployeeInsurancePre newInsurance : newList) {
differenceInsuranceKey = null; differenceInsuranceKey = null;
......
...@@ -543,10 +543,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -543,10 +543,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if (Common.isEmpty(gzEmpId)) { if (Common.isEmpty(gzEmpId)) {
tGzEmpInfo.setCreateBy(user.getId()); tGzEmpInfo.setCreateBy(user.getId());
tGzEmpInfo.setCreateName(user.getNickname()); tGzEmpInfo.setCreateName(user.getNickname());
tGzEmpInfo.setCreateTime(null); tGzEmpInfo.setSubmitTime(null);
// 1.7.14: 档案状态是提交,才存 创建时间(提交时间) // 1.7.14: 档案状态是提交,才存 提交时间
if(CommonConstants.ZERO_STRING.equals(tGzEmpInfoVo.getEmpStatus())){ if(CommonConstants.ZERO_STRING.equals(tGzEmpInfoVo.getEmpStatus())){
tGzEmpInfo.setCreateTime(LocalDateTime.now()); tGzEmpInfo.setSubmitTime(LocalDateTime.now());
} }
this.save(tGzEmpInfo); this.save(tGzEmpInfo);
gzEmpId = tGzEmpInfo.getId(); gzEmpId = tGzEmpInfo.getId();
...@@ -555,7 +555,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -555,7 +555,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
tGzEmpInfo.setUpdateTime(LocalDateTime.now()); tGzEmpInfo.setUpdateTime(LocalDateTime.now());
// 1.7.14: 档案状态是提交,更新 创建时间(提交时间) // 1.7.14: 档案状态是提交,更新 创建时间(提交时间)
if(CommonConstants.ZERO_STRING.equals(tGzEmpInfoVo.getEmpStatus())){ if(CommonConstants.ZERO_STRING.equals(tGzEmpInfoVo.getEmpStatus())){
tGzEmpInfo.setCreateTime(LocalDateTime.now()); tGzEmpInfo.setSubmitTime(LocalDateTime.now());
} }
this.updateById(tGzEmpInfo); this.updateById(tGzEmpInfo);
} }
......
...@@ -103,6 +103,7 @@ ...@@ -103,6 +103,7 @@
<result property="accountProvinceAreaId" column="account_province_area_id"/> <result property="accountProvinceAreaId" column="account_province_area_id"/>
<result property="accountCityAreaId" column="account_city_area_id"/> <result property="accountCityAreaId" column="account_city_area_id"/>
<result property="empStatus" column="emp_status"/> <result property="empStatus" column="emp_status"/>
<result property="submitTime" column="submit_time"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
...@@ -183,7 +184,8 @@ ...@@ -183,7 +184,8 @@
a.hukou_county_area_id, a.hukou_county_area_id,
a.account_province_area_id, a.account_province_area_id,
a.account_city_area_id, a.account_city_area_id,
a.emp_status a.emp_status,
a.submit_time
</sql> </sql>
<sql id="tGzEmpInfo_where"> <sql id="tGzEmpInfo_where">
<if test="tGzEmpInfo != null"> <if test="tGzEmpInfo != null">
...@@ -216,10 +218,10 @@ ...@@ -216,10 +218,10 @@
</if> </if>
<!--查询提交档案时间--> <!--查询提交档案时间-->
<if test="tGzEmpInfo.createTimeStart != null "> <if test="tGzEmpInfo.createTimeStart != null ">
AND a.create_time &gt;= #{tGzEmpInfo.createTimeStart} AND a.submit_time &gt;= #{tGzEmpInfo.createTimeStart}
</if> </if>
<if test="tGzEmpInfo.createTimeEnd != null "> <if test="tGzEmpInfo.createTimeEnd != null ">
AND a.create_time &lt;= #{tGzEmpInfo.createTimeEnd} AND a.submit_time &lt;= #{tGzEmpInfo.createTimeEnd}
</if> </if>
<if test="tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''"> <if test="tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''">
AND a.create_by = #{tGzEmpInfo.createBy} AND a.create_by = #{tGzEmpInfo.createBy}
...@@ -416,7 +418,7 @@ ...@@ -416,7 +418,7 @@
a.del_flag = '0' a.del_flag = '0'
<include refid="tGzEmpInfo_where"/> <include refid="tGzEmpInfo_where"/>
</where> </where>
ORDER by a.emp_status,a.create_time desc,a.id desc ORDER by a.emp_status,a.submit_time desc,a.id desc
</select> </select>
<!--count--> <!--count-->
...@@ -440,7 +442,7 @@ ...@@ -440,7 +442,7 @@
a.emp_push_status, a.emp_push_status,
a.contract_push_status, a.contract_push_status,
a.contract_atta_push_status, a.contract_atta_push_status,
date_format(a.create_time, '%Y-%m-%d %H:%i:%s') create_time, date_format(a.submit_time, '%Y-%m-%d %H:%i:%s') create_time,
a.create_by, a.create_by,
a.create_name, a.create_name,
a.update_by, a.update_by,
...@@ -523,7 +525,7 @@ ...@@ -523,7 +525,7 @@
<include refid="tGzEmpInfo_where"/> <include refid="tGzEmpInfo_where"/>
</where> </where>
group by a.id group by a.id
ORDER by a.emp_status,a.create_time desc,a.id desc ORDER by a.emp_status,a.submit_time desc,a.id desc
<if test="tGzEmpInfo.limitStart != null"> <if test="tGzEmpInfo.limitStart != null">
limit #{tGzEmpInfo.limitStart},#{tGzEmpInfo.limitEnd} limit #{tGzEmpInfo.limitStart},#{tGzEmpInfo.limitEnd}
</if> </if>
......
...@@ -200,6 +200,18 @@ public class TEmployeeInsurancePreController { ...@@ -200,6 +200,18 @@ public class TEmployeeInsurancePreController {
return tEmployeeInsurancePreService.updateInfoSaveInsurancePreInfo(pre); return tEmployeeInsurancePreService.updateInfoSaveInsurancePreInfo(pre);
} }
/**
* 信息修改入口删除商险已购买明细
* @author huych
* @date 2025-08-14 11:46:16
**/
@Operation(description = "信息修改入口删除商险已购买明细")
@Inner
@PostMapping("/inner/deleteInsurancePreInfo")
public Boolean deleteInsurancePreInfo(@RequestBody EmployeeRegistrationPre pre) {
return tEmployeeInsurancePreService.deleteInsurancePreInfo(pre);
}
/** /**
* 商险状态是否正常判断 * 商险状态是否正常判断
* @author huych * @author huych
......
...@@ -76,6 +76,8 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc ...@@ -76,6 +76,8 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
*/ */
Boolean updateInfoSaveInsurancePreInfo(EmployeeRegistrationPre pre); Boolean updateInfoSaveInsurancePreInfo(EmployeeRegistrationPre pre);
Boolean deleteInsurancePreInfo(EmployeeRegistrationPre pre);
Boolean checkExitInsuanceIsProcess(EmployeeRegistrationPreVo preVo); Boolean checkExitInsuanceIsProcess(EmployeeRegistrationPreVo preVo);
TEmployeeInsuranceSelectVo selectInsurancePreInfoList(TEmployeeInsurancePreVo preVo); TEmployeeInsuranceSelectVo selectInsurancePreInfoList(TEmployeeInsurancePreVo preVo);
......
...@@ -644,6 +644,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -644,6 +644,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return true; return true;
} }
@Override
public Boolean deleteInsurancePreInfo(EmployeeRegistrationPre registrationPre) {
//删除已存在的入职确认信息对应的商险明细
preDetailService.remove(Wrappers.<TInsurancePreDetail>lambdaQuery()
.eq(TInsurancePreDetail::getRegisterId, registrationPre.getId()));
return true;
}
@Override @Override
public Boolean checkExitInsuanceIsProcess(EmployeeRegistrationPreVo preVo) { public Boolean checkExitInsuanceIsProcess(EmployeeRegistrationPreVo preVo) {
//如果状态有变动就会拦截 //如果状态有变动就会拦截
......
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