Skip to content

Y
yifu-mvp
Commit 333bc290 authored by huyuchen's avatar huyuchen
Browse files
Options

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

parents 24a0a92b 280b9fc7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 520 deletions
yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckBankNoServiceImpl.java
View file @ 333bc290
......@@ -142,10 +142,13 @@ public class TCheckBankNoServiceImpl extends ServiceImpl<TCheckBankNoMapper, TCh
boolean canCheck = canCheckService.getCanCheck();
for (TCheckBankNo no : noCurlist) {
resR = ChecksUtil.checkBankNoTwo(no.getName(), no.getBankNo(), canCheck);
if (Common.isNotNull(resR) && Common.isNotNull(resR.getData())) {
if (Common.isNotNull(resR) && resR.getCode() == CommonConstants.SUCCESS
&& Common.isNotNull(resR.getData())) {
newNo = resR.getData();
bankMap.put(newNo.getBankNo(), CommonConstants.ZERO_ONE.equals(newNo.getResult()));
bankMap.put(no.getBankNo(), CommonConstants.ZERO_ONE.equals(newNo.getResult()));
saveList.add(newNo);
} else {
bankMap.put(no.getBankNo(), false);
}
}
if (!saveList.isEmpty()) {
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceAreaRes.java
View file @ 333bc290
......@@ -72,14 +72,14 @@ public class TInsuranceAreaRes extends BaseEntity {
@NotBlank(message = "档案-省不能为空")
@ExcelProperty("档案-省")
@Schema(description = "档案-省")
private Integer province;
private String province;
/**
* 档案-市
*/
@ExcelAttribute(name = "档案-市",isArea = true,parentField = "province")
@ExcelProperty("档案-市")
@Schema(description = "档案-市")
private Integer city;
private String city;
/**
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsurancesWarnController.java
View file @ 333bc290
......@@ -52,7 +52,7 @@ public class TInsurancesWarnController {
@Operation(description = "商险到期提醒分页查询")
@GetMapping("/getExpireWarn/Vopage")
public R<IPage<TBusinessInsuranceVo>> getTBusinessInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance) {
return insuranceDetailService.getInsuranceExpireWarnVoPage(page, tBusinessInsurance);
return R.ok(insuranceDetailService.getInsuranceExpireWarnVoPage(page, tBusinessInsurance));
}
/**
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
View file @ 333bc290
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
......@@ -276,4 +277,12 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
**/
List<InsuranceUpdateVO> selectByIds(@Param("ids") List<String> ids);
/**
* @Author fxj
* @Description 商险提醒分页查询
* @Date 16:33 2023/2/20
**/
IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page,
@Param("param")TBusinessInsuranceVo param,
@Param("domains")List<TSettleDomainSelectVo> domains);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @ 333bc290
......@@ -510,7 +510,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
**/
void updateSettleStatus();
R<IPage<TBusinessInsuranceVo>> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance);
IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance);
R<List<WorkBanchWarnVo>> getExpireInsuranceWarn(Integer expireInsuranceWarnNameUrlFlag, Integer noBuyInsuranceWarnNameUrlFlag, Integer noSettleInsuranceWarnNameUrlFlag, Boolean haveAllOrg, Integer userId);
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @ 333bc290
......@@ -27,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceAreaResMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TUpdateStatusErrorMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceAreaResService;
......@@ -127,6 +128,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
private TInsuranceAreaResService tInsuranceAreaResService;
@Resource
private TUpdateStatusErrorMapper updateStatusErrorMapper;
@Resource
private TInsuranceAreaResMapper insuranceAreaResMapper;
/***********************商险办理********************************/
/**
* 每日定时刷新商险到期数据
......@@ -7393,8 +7396,31 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @Date 16:51 2023/2/16
**/
@Override
public R<IPage<TBusinessInsuranceVo>> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo tBusinessInsurance) {
return null;
public IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page, TBusinessInsuranceVo condition) {
YifuUser user = SecurityUtils.getUser();
if (!SecurityUtils.isHaveAllOrg(null, user)) {
R<TSettleDomainListVo > sdRes = archivesDaprUtil.getPermissionByUserId(user.getId());
List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda()
.eq(TInsuranceAreaRes::getUserId,user.getId()).eq(TInsuranceAreaRes::getStatus,CommonConstants.ZERO_STRING));
if (Common.isNotNull(areaRes)) {
List<String> provinces = new ArrayList<>();
List<String> citys = new ArrayList<>();
for (TInsuranceAreaRes res:areaRes){
if (Common.isEmpty(res.getCity())){
provinces.add(res.getProvince());
}else {
citys.add(res.getCity());
}
}
condition.setInsuranceProvinces(provinces);
condition.setInsuranceCitys(citys);
}
condition.setCreateName(SecurityUtils.getUser().getId());
if (Common.isNotNull(sdRes) && Common.isNotNull(sdRes.getData())){
return baseMapper.getInsuranceExpireWarnVoPage(page, condition, sdRes.getData().getListSelectVO());
}
}
return baseMapper.getInsuranceExpireWarnVoPage(page, condition, null);
}
@Override
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @ 333bc290
......@@ -1467,4 +1467,153 @@
</if>
ORDER BY refund.CREATE_TIME DESC,a.ID ASC
</select>
<sql id="selectParamsVo">
t.ID id,
t.EMP_ID empId,
t.EMP_NO empNo,
t.EMP_NAME empName,
t.EMP_IDCARD_NO empIdcardNo,
t.INSURANCE_COMPANY insuranceCompany,
t.INSURANCE_TYPE insuranceType,
t.POLICY_START policyStart,
t.POLICY_END policyEnd,
t.BUY_PAY buyPay,
t.IS_AT_SALARY isAtSalary,
t.REMARK,
t.CREATE_USER createUser,
t.CREATE_TIME createTime,
t.STATUS,
t.POLICY_NO policyNo,
t.MEDICAL_MONEY medicalMoney,
t.DEATH_DISABILITY_MONEY deathDisabilityMoney,
t.SETTLEMENT_DEPART settlementDepart,
t.SETTLEMENT_ORGAN settlementOrgan,
t.REPLACE_DATE replaceDate,
t.REPLACE_STATUS replaceStatus,
t.BUSINESS_INSURANCE_ADDR businessInsuranceAddr,
t.SETTLE_TYPE settleType,
t.BUY_STANDARD buyStandard,
t.BATCH_DATE batchDate,
t.IS_NOTICE isNotice,
t.SETTLE_MONTH settleMonth,
t.INVOICE_NO invoiceNo,
t.BUY_TYPE buyType,
t.LAST_UPDATE_USER lastUpdateUser,
t.LAST_UPDATE_TIME lastUpdateTime,
t.OLD_ID oldId,
t.SETTLEMENT_FORM_ID settlementFormId,
t.IS_SUBMIT,
t.CUSTOMER_NAME customerName,
t.CUSTOMER_ID customerId,
t.SETTLEMENT_ORGAN_NAME settlementOrganName,
t.SETTLEMENT_ORGAN_NO settlementOrganNo,
t.SETTLE_FORM_TYPE settleFormType,
t.POLICY_EFFECT policyEffect,
t.SETTLE_FORM_ID settleFormId,
p.NAME insuranceTypeName,
tic.COMPANY_NAME insuranceCompanyName,
t.BUSINESS_INSURANCE_PROV_ID businessInsuranceProvId,
t.BUSINESS_INSURANCE_ADDR_ID businessInsuranceAddrId,
t.BUSINESS_INSURANCE_PROV businessInsuranceProv,t.VALID_FLAG validFlag,
t.FORECAST_BUY_PAY,
t.SETTLE_BUY_PAY_TYPE
,case when t.POLICY_END &lt; date(now()) then '1' else 0 end 'expireFlag',
t.post,
t.BUY_MONTH,
t.REFUND_RECORD_ID,
t.REFUND_MONEY,
t.REFUND_CREATE_TIME,
t.REFUND_CREATE_USER,
t.USER_DEPT_NAME
</sql>
<sql id="expire_sql_param">
select
a.id,
a.EMP_NAME,
a.EMP_IDCARD_NO,
a.DEPT_NAME,
a.DEPT_NO,
a.INSURANCE_COMPANY_NAME,
a.INSURANCE_TYPE_NAME,
a.POLICY_START,
a.POLICY_END,
a.BUY_STANDARD,
a.ACTUAL_PREMIUM,
a.CREATE_NAME,
a.CREATE_TIME,
a.BUY_HANDLE_STATUS,
a.POLICY_NO,
a.MEDICAL_QUOTA,
a.DIE_DISABLE_QUOTA,
a.SETTLE_TYPE,
a.SETTLE_MONTH,
a.INVOICE_NO,
r2.REPLACE_TIME,
a.POLICY_EFFECT,
a.UNIT_NAME,
a.UNIT_NO,
a.REMARK,
a.INSURANCE_PROVINCE_NAME,
a.INSURANCE_CITY_NAME,
a.IS_EFFECT,
a.POST,
r.fromEmpName,
r.toEmpName,
r.REPLACE_TIME as "toReplaceTime",
a.IS_OVERDUE,
a.ESTIMATE_PREMIUM,
rf.REFUND_MONEY,
rf.CREATE_TIME as "refundCreateTime",
rf.CREATE_NAME as "refundCreateUser",
a.CREATE_USER_DEPT_NAME
from t_insurance_detail a
LEFT JOIN view_insurance_replace r on a.id=r.TO_INSURANCE_DETAIL_ID
LEFT JOIN view_insurance_replace r2 on a.id=r2.FROM_INSURANCE_DETAIL_ID
LEFT JOIN t_insurance_refund rf on rf.INS_DETAIL_ID=a.id
</sql>
<sql id="expire_sql_where">
<where>
<!-- info.AUDIT_STATUS='0' and t.STATUS = 5 状态 0.待提交 1.待办理 2.已提交保险公司 3.已办理 4.办理失败 5：待结算（已输入保单号）-->
AND t.INVALID_FLAG='0' <!--未作废-->
<!--一个月内的，没有再续买商险的数据-->
and t.STATUS in('3','5','6','7','8','9')
and EXPIRE_IGNORE_FLAG='1'
and (
date_add(curdate() - day(curdate()) + 1, interval 3 month) >
t.POLICY_END
)
and t.VALID_FLAG='0'
<if test="param.empName != null and param.empName.trim() != ''">
AND t.EMP_NAME like CONCAT('%' , #{param.empName},'%')
</if>
<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
AND t.EMP_IDCARD_NO like CONCAT('%' ,#{param.empIdcardNo},'%')
</if>
<!--数据权限判断-->
AND (t.CREATE_USER_ID = #{param.createUserId}
<if test="domains != null">
<if test="domains.size() > 0">
or t.SETTLEMENT_ORGAN in
<foreach collection="domains" item="param" index="index" open="(" close=")" separator=",">
#{param.id}
</foreach>
</if>
</if>
<if test="domains == null">
or 1=1
</if>
)
</where>
order by t.CREATE_TIME desc
</sql>
<select id="getInsuranceExpireWarnVoPage"
resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.TBusinessInsuranceVo">
<include refid="expire_sql_param"/>
<include refid="expire_sql_where"/>
</select>
</mapper>
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @ 333bc290
......@@ -469,7 +469,8 @@ public class SalaryAccountUtil implements Serializable {
if (CommonConstants.ONE_STRING.equals(entity.getIsNewEmployee())) {
if (!this.setNewEmpBase(newEmps, newEmps.getLineNums(), errorList, notLabour
, entity, salaryType, dept, user, entity.getSalaryStyle()
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()), invoiceTitle)) {
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()), invoiceTitle
, entity.getSaiList())) {
continue;
}
saveNewEmpList.add(newEmps);
......@@ -845,7 +846,7 @@ public class SalaryAccountUtil implements Serializable {
private boolean setNewEmpBase(TSalaryEmployee newEmp, int i, List<ErrorMessage> errorList, boolean notLabour
, TSalaryAccountVo entity, String salaryType, TSettleDomainSelectVo dept, YifuUser user, String salaryStyle
, boolean salaryGiveTimeFlag, String invoiceTitle) {
, boolean salaryGiveTimeFlag, String invoiceTitle, List<TSalaryAccountItemVo> saiList) {
String newEmpStr = "新员工";
if (!notLabour) {
newEmpStr = "劳务费";
......@@ -894,6 +895,12 @@ public class SalaryAccountUtil implements Serializable {
errorList.add(new ErrorMessage((i + 2), error));
return false;
} else {
TSalaryAccountItemVo sai = new TSalaryAccountItemVo();
sai.setCnName(SalaryConstants.COST_REDUCTION);
sai.setJavaFiedName(SalaryConstants.COST_REDUCTION_JAVA);
sai.setSalaryMoney(DateUtil.getTaxMonthMoney(entity.getTaxMonth()));
sai.setIsTax(CommonConstants.ZERO_INT);
saiList.add(sai);
newEmp.setTaxMonth(entity.getTaxMonth());
}
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 333bc290
......@@ -4501,8 +4501,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setBirthHandle(handleStatusTemp);
}*/
}
if (socialType.contains(CommonConstants.SIX_STRING)
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())) {
if (socialType.contains(CommonConstants.SIX_STRING)) {
if (CommonConstants.FIVE_STRING.equals(sf.getBigailmentHandle())){
if (CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle())){
socialInfo.setBigailmentHandle(handleStatusTemp);
......
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