Skip to content

Y
yifu-mvp
Commit 39cbb9d3 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

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

parents cd58594b ce9d3064
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 48 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TProveRecord.java
View file @ 39cbb9d3
......@@ -94,7 +94,7 @@ public class TProveRecord extends Model<TProveRecord> {
@ExcelAttribute(name = "开具日期")
@ExcelProperty("开具日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate creatDate;
private Date creatDate;
/**
* 开始月份
*/
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/LUnitInfoForProveController.java 0 → 100644
View file @ 39cbb9d3
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.entity.LUnitInfoForProve;
import com.yifu.cloud.plus.v1.yifu.archives.service.LUnitInfoForProveService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author pwang
* @date 2019-11-05 15:24:25
*/
@RestController
@AllArgsConstructor
@RequestMapping("/lunitinfoforprove")
@Tag(name = "工资证明操作数据")
public class LUnitInfoForProveController {
private final LUnitInfoForProveService lUnitInfoForProveService;
/**
* 简单分页查询
* 获取用户自己的操作数据
*
* @return
*/
@Operation(summary = "获取用户自己的操作数据")
@GetMapping("/ownList")
public R<List<LUnitInfoForProve>> getownList() {
YifuUser user = SecurityUtils.getUser();
return new R<>(lUnitInfoForProveService.list(Wrappers.<LUnitInfoForProve>lambdaQuery().eq(LUnitInfoForProve::getCreatUser, user.getId())));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java
View file @ 39cbb9d3
......@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
......@@ -151,7 +152,7 @@ public class SalaryProveController {
record.setEmployeeName(em.getEmpName());
record.setEmployeeIdCard(em.getEmpIdcard());
record.setEmployeeInfo(emId);
record.setCreatDate(LocalDate.now());
record.setCreatDate(new Date());
record.setEmployeeSettleDepartName(em.getDeptName());
record.setPost(em.getPost());
count = LocalDateTimeUtils.getBeginOfMonth(endDate.concat("01"), startDate.concat("01"), "yyyyMMdd") + 1;
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @ 39cbb9d3
......@@ -1806,6 +1806,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceSettle settle;
TInsurancePolicy one;
BigDecimal bigDecimalAct;
R<TIncomeDetailReturnVo> detailInfoList;
for (InsuranceRegisterParam success : listSuccess) {
long d1 = System.currentTimeMillis();
//登记保单保费
......@@ -1814,7 +1815,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
actualMoney = detail.getActualPremium();
boolean booleanInvoiceNo = false;
if (StringUtils.isNotBlank(success.getInvoiceNo())){
if (Common.isEmpty(detail.getInvoiceNo()) || success.getInvoiceNo().equals(detail.getInvoiceNo())) {
if (Common.isEmpty(detail.getInvoiceNo()) || !success.getInvoiceNo().equals(detail.getInvoiceNo())) {
booleanInvoiceNo = true;
}
detail.setInvoiceNo(success.getInvoiceNo());
......@@ -1843,7 +1844,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
boolean booleanPolicyNo = false;
if (StringUtils.isNotBlank(success.getPolicyNo())){
if (Common.isEmpty(detail.getPolicyNo()) || success.getPolicyNo().equals(detail.getPolicyNo())) {
if (Common.isEmpty(detail.getPolicyNo()) || !success.getPolicyNo().equals(detail.getPolicyNo())) {
booleanPolicyNo = true;
}
detail.setPolicyNo(success.getPolicyNo());
......@@ -1954,12 +1955,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
if (Optional.ofNullable(settle).isPresent()) {
//如果当前实缴信息未推送，则新增实缴单推送
if (StringUtils.isNotBlank(success.getInvoiceNo())) {
detail.setInvoiceNo(success.getInvoiceNo());
}
if (StringUtils.isNotBlank(success.getPolicyNo())) {
detail.setPolicyNo(success.getPolicyNo());
}
doJointInsuranceTask.asynchronousEkpInfo(detail,settle,CommonConstants.FOUR_INT);
}
}
......@@ -1997,7 +1992,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
incomeDetail.setFeeType(CommonConstants.ONE_STRING);
//判断是否存在当月的商险收入数据
R<TIncomeDetailReturnVo> detailInfoList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
detailInfoList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
if (Common.isNotNull(detailInfoList) && detailInfoList.getCode() == CommonConstants.SUCCESS
&& !detailInfoList.getData().getDetailList().isEmpty()) {
//生成红冲数据
......@@ -2030,7 +2025,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
incomeDetail.setMoney(actualMoney);
}
//判断是否存在当月的商险收入数据
R<TIncomeDetailReturnVo> detailInfoList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
detailInfoList = socialDaprUtils.getTIncomeDetailList(incomeDetail);
if (Common.isNotNull(detailInfoList) && detailInfoList.getCode() == CommonConstants.SUCCESS
&& !detailInfoList.getData().getDetailList().isEmpty()) {
//生成红冲数据
......@@ -3481,7 +3476,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
Map<String,String> map = new HashMap<>();
InsuranceRegisterParam param;
SettleVo settleVo;
List<TInsuranceEkp> ekpList;
for (int i = 0; i < distinctList.size(); i++) {
param = distinctList.get(i);
// 必填校验
......@@ -3588,7 +3583,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>();
ekpLambdaQueryWrapper.eq(TInsuranceEkp :: getDetailId,detail.getId()).eq(TInsuranceEkp ::getResendFlag,CommonConstants.ZERO_INT);
List<TInsuranceEkp> ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
ekpList = tInsuranceEkpService.list(ekpLambdaQueryWrapper);
if(CollectionUtils.isNotEmpty(ekpList)){
param.setErrorMessage(InsurancesConstants.EKP_SEND_ERROR);
continue;
......@@ -3671,49 +3666,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (Common.isNotNull(detail.getActualPremium())) {
booleanActualPremium = StringUtils.isNotBlank(param.getActualPremium()) && detail.getActualPremium().compareTo(new BigDecimal(param.getActualPremium())) != 0;
}
//如果当前为合并结算
if (CommonConstants.ZERO_INT == detail.getSettleType() && StringUtils.isNotBlank(detail.getDefaultSettleId())){
settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
if (Optional.ofNullable(settle).isPresent()){
settleVo = getInsuranceDetailSettleStatus(detail.getId(), detail.getDefaultSettleId());
if(!Common.isEmpty(settleVo)){
//保费更新，保单号，发票号不更新
if(booleanActualPremium && !booleanPolicyNo && !booleanInvoiceNo){
if ( InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())){
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED);
continue;
}
if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED);
continue;
}
}
//保单号，发票号更新时
if(!booleanPolicyNo || !booleanInvoiceNo){
if (InsurancesConstants.SETTLE_TWO.equals(settleVo.getEstimateStatus()) || InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())){
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED);
continue;
}
if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getEstimateStatus()) || InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED);
}
}
}
}
} else if (CommonConstants.ONE_INT == detail.getSettleType() && StringUtils.isNotBlank(detail.getDefaultSettleId())){
//如果当前为单独结算，判断实缴有没有结算
if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
if (Optional.ofNullable(settle).isPresent()){
settleVo = getInsuranceDetailSettleStatus(detail.getId(), detail.getDefaultSettleId());
if(!Common.isEmpty(settleVo) && booleanActualPremium && !booleanPolicyNo && !booleanInvoiceNo){
//判断实缴是否结算中
if(!Common.isEmpty(settleVo) && (booleanActualPremium || booleanPolicyNo || booleanInvoiceNo)){
//保费更新或者保单号发票号更新
if (InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())) {
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED);
continue;
}
if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())) {
param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED);
continue;
}
}
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ 39cbb9d3
......@@ -991,6 +991,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
infoVo.getEmpIdcard() + "的社保数据(请查验社保缴纳地)"));
continue;
}
} else {
tSocialInfo = null;
}
//导入模板判重 养老
......
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