Commit cd7efe6f authored by hongguangwu's avatar hongguangwu

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

parents 0b12f0c0 7be115e8
...@@ -186,7 +186,7 @@ public class SocialDaprUtils { ...@@ -186,7 +186,7 @@ public class SocialDaprUtils {
* @return * @return
**/ **/
public R<TEmployeeInsuranceWorkDayVo> getBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) { public R<TEmployeeInsuranceWorkDayVo> getBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tholidayinfo/inner/getBeforeOrAfterWorkDay", JSON.toJSONString(vo), TEmployeeInsuranceWorkDayVo.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tholidayinfo/inner/getInnerInitBeforeOrAfterWorkDay", JSON.toJSONString(vo), TEmployeeInsuranceWorkDayVo.class, SecurityConstants.FROM_IN);
} }
/** /**
......
...@@ -1188,24 +1188,36 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1188,24 +1188,36 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo.setCreateName(user.getNickname()); preVo.setCreateName(user.getNickname());
preVo.setUpdateBy(user.getId()); preVo.setUpdateBy(user.getId());
preVo.setEmpIdcard(registration.getEmpIdcard()); preVo.setEmpIdcard(registration.getEmpIdcard());
if (Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) {
preVo.setPolicyStart(preVo.getJoinLeaveDate());
}
//预计派单日期 //预计派单日期
if (Common.isEmpty(preVo.getExpectedCollectionTime())) { if (Common.isEmpty(preVo.getExpectedCollectionTime())) {
TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo(); //新增选择保单开始日期类型= 默认等于入职日期
dayVo.setType(CommonConstants.ONE_STRING); if (Common.isNotNull(preVo.getPolicyStartType()) && CommonConstants.ONE_STRING.equals(preVo.getPolicyStartType())) {
if (preVo.getBuyType() ==1) { preVo.setPolicyStart(preVo.getJoinLeaveDate());
dayVo.setRegistDate(preVo.getPolicyStart()); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
} else { dayVo.setType(CommonConstants.TWO_STRING);
dayVo.setRegistDate(preVo.getJoinLeaveDate()); dayVo.setRegistDate(preVo.getJoinLeaveDate());
} R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(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())) { && Common.isNotNull(dataR.getData().getPriDisDate())) {
preVo.setExpectedCollectionTime(dataR.getData().getRegistDate()); preVo.setExpectedCollectionTime(dataR.getData().getPriDisDate());
preVo.setPolicyStart(dataR.getData().getRegistDate());
} else {
preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate());
preVo.setPolicyStart(preVo.getJoinLeaveDate());
}
} else { } else {
preVo.setExpectedCollectionTime(preVo.getPolicyStart()); TEmployeeInsuranceWorkDayVo dayVo = new TEmployeeInsuranceWorkDayVo();
dayVo.setType(CommonConstants.ONE_STRING);
dayVo.setRegistDate(preVo.getJoinLeaveDate());
R<TEmployeeInsuranceWorkDayVo> dataR = socialDaprUtils.getBeforeOrAfterWorkDay(dayVo);
if (Common.isNotNull(dataR) && Common.isNotNull(dataR.getData())
&& Common.isNotNull(dataR.getData().getRegistDate())) {
preVo.setExpectedCollectionTime(dataR.getData().getRegistDate());
} else {
preVo.setExpectedCollectionTime(preVo.getJoinLeaveDate());
}
} }
} }
preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
......
...@@ -381,7 +381,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -381,7 +381,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
List<TEmployeeInsurancePre> unConfirmList = baseMapper.getAllUnconfimData(); List<TEmployeeInsurancePre> unConfirmList = baseMapper.getAllUnconfimData();
if (Common.isNotNull(unConfirmList) && !unConfirmList.isEmpty()) { if (Common.isNotNull(unConfirmList) && !unConfirmList.isEmpty()) {
for(TEmployeeInsurancePre pre : unConfirmList) { for(TEmployeeInsurancePre pre : unConfirmList) {
sendMessageToWx(pre,CommonConstants.ONE_STRING); sendMessageToWx(pre);
} }
} }
} }
...@@ -478,7 +478,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -478,7 +478,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
} }
//发送企业微信待办 //发送企业微信待办
private void sendMessageToWx(TEmployeeInsurancePre insurancePre, String type) { private void sendMessageToWx(TEmployeeInsurancePre insurancePre) {
//获取前端客服 //获取前端客服
SysUser user; SysUser user;
if (Common.isEmpty(insurancePre.getCustomerUserLoginname())) { if (Common.isEmpty(insurancePre.getCustomerUserLoginname())) {
...@@ -498,33 +498,10 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -498,33 +498,10 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
Map<String, Object> requestMap = new HashMap<>(); Map<String, Object> requestMap = new HashMap<>();
Map<String, Object> textcard = new HashMap<>(); Map<String, Object> textcard = new HashMap<>();
String authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName() + "/auth/oauth/wxLogin", "6" + insurancePre.getId()); String authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName() + "/auth/oauth/wxLogin", "03" + insurancePre.getCustomerUserLoginname());
StringBuilder description = new StringBuilder(); StringBuilder description = new StringBuilder();
String result;
int buyType = insurancePre.getBuyType();
switch (buyType) {
case CommonConstants.ONE_INT:
result = "新增";
break;
case CommonConstants.THREE_INT:
result = "批增";
break;
default:
result = "替换";
}
String title = "商险投保确认"; String title = "商险投保确认";
if (CommonConstants.ONE_STRING.equals(type)) { description.append("您有新的商险购买待确认数据,请及时确认").append("<br>");
description.append("项目名称:").append(insurancePre.getDeptName()).append("<br>");
description.append("项目编码:").append(insurancePre.getDeptNo()).append("<br>");
description.append("员工姓名:").append(insurancePre.getEmployeeName()).append("<br>");
description.append("身份证号:").append(insurancePre.getEmpIdcard()).append("<br>");
description.append("购买类型:").append(result).append("<br>");
} else {
// description.append("项目名称:").append(registration.getDeptName()).append("<br>");
// description.append("项目编码:").append(registration.getDeptNo()).append("<br>");
// description.append("入职人数:").append(registration.getInNum()).append("<br>");
// description.append("购买类型:").append(registration.getOutNum()).append("<br>");
}
textcard.put("title", title); textcard.put("title", title);
textcard.put("url", authUrl); textcard.put("url", authUrl);
textcard.put("description", description.toString()); textcard.put("description", description.toString());
......
...@@ -289,5 +289,6 @@ ...@@ -289,5 +289,6 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_employee_insurance_pre a FROM t_employee_insurance_pre a
where a.process_status = '0' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE() where a.process_status = '0' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE()
group by a.customer_user_loginname
</select> </select>
</mapper> </mapper>
...@@ -174,6 +174,16 @@ public class THolidayInfoController { ...@@ -174,6 +174,16 @@ public class THolidayInfoController {
tHolidayInfoService.createHolidayInfo(); tHolidayInfoService.createHolidayInfo();
} }
/**
* @Author huyc
* @Description 查询日期的前一个/后一个工作日
* @Date 10:27 2025/4/7
**/
@PostMapping("/getInitBeforeOrAfterWorkDay")
public R getInitBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return R.ok(tHolidayInfoService.getInitBeforeOrAfterWorkDay(vo));
}
/** /**
* @Author huyc * @Author huyc
* @Description 查询日期的前一个/后一个工作日 * @Description 查询日期的前一个/后一个工作日
...@@ -190,9 +200,9 @@ public class THolidayInfoController { ...@@ -190,9 +200,9 @@ public class THolidayInfoController {
* @Date 10:27 2025/4/7 * @Date 10:27 2025/4/7
**/ **/
@Inner @Inner
@PostMapping("/inner/getBeforeOrAfterWorkDay") @PostMapping("/inner/getInnerInitBeforeOrAfterWorkDay")
public TEmployeeInsuranceWorkDayVo getBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) { public TEmployeeInsuranceWorkDayVo getInnerInitBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return tHolidayInfoService.selectBeforeOrAfterWorkDay(vo); return tHolidayInfoService.getInitBeforeOrAfterWorkDay(vo);
} }
/** /**
......
...@@ -51,6 +51,8 @@ public interface THolidayInfoService extends IService<THolidayInfo> { ...@@ -51,6 +51,8 @@ public interface THolidayInfoService extends IService<THolidayInfo> {
void createHolidayInfo(); void createHolidayInfo();
TEmployeeInsuranceWorkDayVo getInitBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo);
TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo); TEmployeeInsuranceWorkDayVo selectBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo);
Boolean checkIsWorkDay(TEmployeeInsuranceWorkDayVo vo); Boolean checkIsWorkDay(TEmployeeInsuranceWorkDayVo vo);
......
...@@ -294,7 +294,23 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo ...@@ -294,7 +294,23 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
holidayMap.put(h.getDate(),h.getDay()); holidayMap.put(h.getDate(),h.getDay());
} }
} }
if (vo.getType().equals(CommonConstants.TWO_STRING)) { getWorkDay(holidayMap,vo);
return vo;
}
@Override
public TEmployeeInsuranceWorkDayVo getInitBeforeOrAfterWorkDay(TEmployeeInsuranceWorkDayVo vo) {
//获取当年所有假期配置表
Date date = new Date();
List<THolidayInfo> holidayInfos = baseMapper.selectList(Wrappers.<THolidayInfo>query().lambda()
.eq(THolidayInfo::getYear,DateUtil.getYear(date)));
Map<Date,String> holidayMap = new HashMap<>();
if (Common.isNotNull(holidayInfos)){
for (THolidayInfo h:holidayInfos){
holidayMap.put(h.getDate(),h.getDay());
}
}
if (CommonConstants.TWO_STRING.equals(vo.getType())) {
//查找入职日期的前一个工作日 //查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo newVo = new TEmployeeInsuranceWorkDayVo(); TEmployeeInsuranceWorkDayVo newVo = new TEmployeeInsuranceWorkDayVo();
newVo.setRegistDate(vo.getRegistDate()); newVo.setRegistDate(vo.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