Skip to content

Y
yifu-mvp
Commit e6421469 authored by hongguangwu's avatar hongguangwu
Browse files
Options

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

parents 5bc2a4cc 39e207e3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 877 additions and 238 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainUpServerTeamVo.java 0 → 100644
View file @ e6421469
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
/**
* @Author fxj
* @Date 2022/11/23
* @Description
* @Version 1.0
*/
@Data
public class TSettleDomainUpServerTeamVo implements Serializable {
/**
* 项目编码
*/
@Schema(description = "项目编码")
private String departNo;
/**
* EKP的服务团队 : 存
*/
@Schema(description = "EKP的服务团队", name = "serviceTeam")
private String serviceTeam;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @ e6421469
......@@ -378,4 +378,23 @@ public class TSettleDomainController {
List<TSettleDomainUpdVo> list= JSONObject.parseArray(jsonStr, TSettleDomainUpdVo.class);
return tSettleDomainService.updateProjectStopStatus(list);
}
/**
* 修改项目表--EKP调用接口
* @author fxj
* @param jsonStr
* @return R
*/
@Operation(summary = "更新项目服务团队--EKP调用接口", description = "更新项目服务团队--EKP调用接口")
@SysLog("更新项目服务团队--EKP调用接口")
@PostMapping("/updateProjectServerTeam")
public R<Boolean> updateProjectServerTeam(@RequestBody String jsonStr) {
try {
jsonStr = URLDecoder.decode(jsonStr, CommonConstants.UTF8).replace("=", "");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
List<TSettleDomainUpServerTeamVo> list= JSONObject.parseArray(jsonStr, TSettleDomainUpServerTeamVo.class);
return tSettleDomainService.updateProjectServerTeam(list);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @ e6421469
......@@ -122,4 +122,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
List<TCustomerInfo> getTCustomerInfoForB(List<String> customerList);
R<IPage<CustomerOwnerSelectVo>> getCustomerOwnerPage(Page<CustomerOwnerSelectVo> page, String customerName, String userId);
R<Boolean> updateProjectServerTeam(List<TSettleDomainUpServerTeamVo> list);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @ e6421469
......@@ -646,6 +646,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (!errorMessageList.isEmpty()) {
return R.failed(errorMessageList);
} else {
YifuUser user = SecurityUtils.getUser();
//更新项目档案
if (!updProjectList.isEmpty()) {
baseMapper.updateReduceEmpProject(updProjectList);
......@@ -653,12 +654,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//更新人员档案
if (!updList.isEmpty()) {
List<TEmployeeInfo> updEmpInfoList = updList.stream().distinct().collect(Collectors.toList());
YifuUser user = SecurityUtils.getUser();
doJointTask.doUpdateEmployeeInfo(updEmpInfoList, user);
}
// 记录变更日志
if (!updateProjectList.isEmpty()) {
doJointTask.saveModificationRecord(updateProjectList);
doJointTask.saveModificationRecord(updateProjectList,user);
}
}
return R.ok();
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @ e6421469
......@@ -182,7 +182,6 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return R.failed("获取区域数据失败！");
}
Map<String,String> areaMap = areaListR.getData().getLabelIdMap();
R<SysUserListVo> res;
String errorStr;
TSettleDomain domain;
for (TSettleDomainEkpVo vo:list) {
......@@ -206,14 +205,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
domain.setId(tSettleDomainInfo.getId());
}
// 处理服务团队数据权限 2022-09-19 fxj
if (Common.isNotNull(domain.getServiceTeam())){
res = upmsDaprUtils.getUserIdsByUserNames(domain.getServiceTeam());
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())){
// 先清理缓存
this.removeSettleCache(null,res.getData().getUserIds());
saveForEkp(res.getData().getUserList(), domain);
}
}
initServerTeamPermission(domain);
domain.setDeleteFlag(CommonConstants.ZERO_STRING);
if (Common.isNotNull(tSettleDomainInfo)) {
baseMapper.updateById(domain);
......@@ -472,4 +464,30 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
String userId) {
return R.ok(baseMapper.getCustomerOwnerPage(page,customerName,userId));
}
/**
* @Author fxj
* @Description 更新服务团队人员权限
* @Date 11:23 2023/2/3
**/
@Override
public R<Boolean> updateProjectServerTeam(List<TSettleDomainUpServerTeamVo> list) {
TSettleDomain domain;
for (TSettleDomainUpServerTeamVo vo:list) {
domain = new TSettleDomain();
BeanUtil.copyProperties(vo,domain);
initServerTeamPermission(domain);
}
return R.ok(Boolean.TRUE,CommonConstants.RESULT_DATA_SUCESS);
}
private void initServerTeamPermission(TSettleDomain domain) {
if (Common.isNotNull(domain.getServiceTeam())){
R<SysUserListVo> res = upmsDaprUtils.getUserIdsByUserNames(domain.getServiceTeam());
if (Common.isNotNull(res) && Common.isNotNull(res.getData()) && Common.isNotNull(res.getData().getUserList())){
// 先清理缓存
this.removeSettleCache(null, res.getData().getUserIds());
saveForEkp(res.getData().getUserList(), domain);
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java
View file @ e6421469
......@@ -132,12 +132,12 @@ public class DoJointTask {
* @return: void
**/
@Async
public void saveModificationRecord(List<EmployeeProjectNewOldVO> updateProjectList) {
public void saveModificationRecord(List<EmployeeProjectNewOldVO> updateProjectList,YifuUser user) {
try {
for (EmployeeProjectNewOldVO newOldVO : updateProjectList) {
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1]
, "", newOldVO.getNewProjectEmployee().getId()
, newOldVO.getOldProjectEmployee(), newOldVO.getNewProjectEmployee());
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],""
, newOldVO.getNewProjectEmployee().getId(), newOldVO.getOldProjectEmployee(),
newOldVO.getNewProjectEmployee(),user);
}
} catch (Exception e) {
log.error("档案-更新项目档案操作记录错误", e);
......
yifu-archives/yifu-archives-biz/src/main/resources/application-test.yml
View file @ e6421469
......@@ -9,6 +9,7 @@ spring:
host: 192.168.1.65
port: 22379
password: '@yf_2017'
connect-timeout: 0
datasource:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @ e6421469
......@@ -217,7 +217,10 @@
a2.AREA_NAME ID_CITY,
a3.AREA_NAME ID_TOWN,
b.EMP_REGIS_TYPE,
b.IS_COLLEGE,
CASE WHEN b.IS_COLLEGE=0 THEN "否"
WHEN b.IS_COLLEGE =1 THEN "是"
ELSE b.IS_COLLEGE
END as "IS_COLLEGE",
b.HIGN_EDUCATION,
b.SCHOOL,
b.MAJOR,
......
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @ e6421469
......@@ -133,6 +133,9 @@ public interface CommonConstants {
String FIVE_STRING = "5";
String TWELVE_STRING = "12";
String ELEVEN_STRING = "11";
int TWELVE_INT = 12;
String THIRTEEN_STRING = "13";
......
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
View file @ e6421469
......@@ -143,7 +143,7 @@ public class ExcelUtil <T> implements Serializable {
}
field.set(vo, Common.isNotNull(value)?value:field.get(vo));
}catch (Exception e){
log.error("字典数据解析异常");
log.error("字典数据解析异常",e);
}
}
}
......@@ -1120,7 +1120,7 @@ public class ExcelUtil <T> implements Serializable {
}
field.set(vo, Common.isNotNull(value)?value:field.get(vo));
}catch (Exception e){
log.error("字典数据解析异常");
log.error("字典数据解析异常",e);
}
}
}
......
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SalaryDaprUtil.java
View file @ e6421469
......@@ -31,6 +31,6 @@ public class SalaryDaprUtil {
* @return
**/
public R<Boolean> updateSalarySettleStatus(List<EkpSocialViewVo> infoVo) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tincome/inner/updateSalarySettleStatus", JSON.toJSONString(infoVo), Boolean.class, SecurityConstants.FROM_IN);
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsalaryaccount/inner/updateSalarySettleStatus", JSON.toJSONString(infoVo), Boolean.class, SecurityConstants.FROM_IN);
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @ e6421469
......@@ -396,6 +396,19 @@ public class TDispatchInfo extends BaseEntity {
/**
* 社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3 部分办理成功 4 办理中
*
* 20230131 MVP1.5.0版本新增拆分派减逻辑：
* 1、派减状态：增加：办理中（派减存在未处理完的事项时，状态为“办理中”）、部分办理失败状态（派减全部事项处理完毕，存在办理失败的事项）——同派增状态保持一致
* 2、预估数据逻辑：仅当派减办理成功状态时，才会不生成次月预估费用；未办理、办理中、部分办理失败都是全额生成社保预估费用；
* 3、档案查询中的状态沿用派增的处理中和部分购买；
* 4、新增三种无需审核的合同需测试验证；
* 5、派减全部减掉之后，在社保公积金查询处，将“停缴日期”调整为“最迟停缴日期”，取最后一次的办理成功时客服导表中填写的停缴日期，精确到日；
* 6、社保公积金查询、派单查询、档案查询-社保详情中，针对派减的在下方明细处增加“停缴日期”列，显示到“年月日”；
* 7、流程进展明细中，将分项减员的操作记录按照操作人、操作时间、派减项进行记录；
* 8、社保公积金查询处，查询条件：社保状态-增加“派减-办理中”、”派减-部分办理失败“，支持查询、列表正常显示、及导出；
* 9、批量办理界面呈现效果按照芳利拍照的效果呈现；
* 10、针对派单-部分派减的，需判断是否有流程中的数据，如果有，不允许再次发起；仅当派单项全部为完结状态，并且有未派减项，才允许发起派减；
* 11、增加查询项-”派单项“下拉多选——养老、工伤、失业、医保、生育、大病；搜索项只要有重叠的都可以被检索到；
*/
@Length(max = 1, message = "社保办理状态 不能超过1个字符" )
@ExcelAttribute(name = "社保办理状态", maxLength = 1)
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @ e6421469
......@@ -269,12 +269,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("审核状态" )
private String auditStatus;
/**
* 办理状态：0待办理/1已办理2办理失败3已派减 4 办理中 5 部分办理失败
* 办理状态：0待办理/1已办理2办理失败3已派减 4 办理中 5 部分办理失败 6 派减办理中 7 派减部分办理失败
*/
@NotBlank(message = "办理状态不能为空" )
@Length(max = 32, message = "办理状态 不能超过32个字符" )
@ExcelAttribute(name = "办理状态", isNotEmpty = true, errorInfo = "办理状态不能为空", maxLength = 32)
@Schema(description = "办理状态：0待办理/1已办理2办理失败3已派减4 办理中 5 部分办理失败" )
@Schema(description = "办理状态：0待办理/1已办理2办理失败3已派减4 办理中 5 部分办理失败 6 派减办理中 7 派减部分办理失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("办理状态" )
private String handleStatus;
......@@ -787,59 +787,109 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病起缴日期" )
private Date bigailmentStart;
/**
* 养老停缴日期
*/
@ExcelAttribute(name = "养老停缴日期", isDate = true)
@Schema(description = "养老停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老停缴日期" )
private Date pensionReduceStart;
/**
* 医疗停缴日期
*/
@ExcelAttribute(name = "医疗停缴日期", isDate = true)
@Schema(description = "医疗停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗停缴日期" )
private Date medicalReduceStart;
/**
* 失业停缴日期
*/
@ExcelAttribute(name = "失业停缴日期", isDate = true)
@Schema(description = "失业停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业停缴日期" )
private Date unemployReduceStart;
/**
* 工伤停缴日期
*/
@ExcelAttribute(name = "工伤停缴日期", isDate = true)
@Schema(description = "工伤停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤停缴日期" )
private Date workInjuryReduceStart;
/**
* 生育停缴日期
*/
@ExcelAttribute(name = "生育停缴日期", isDate = true)
@Schema(description = "生育停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育停缴日期" )
private Date birthReduceStart;
/**
* 大病停缴日期
*/
@ExcelAttribute(name = "大病停缴日期", isDate = true)
@Schema(description = "大病停缴日期" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病停缴日期" )
private Date bigailmentReduceStart;
/**
* 养老办理状态：0待办理1办理成功2办理失败3已派减
* 养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "养老办理状态：0待办理1办理成功2办理失败3已派减 不能超过1个字符" )
@ExcelAttribute(name = "养老办理状态：0待办理1办理成功2办理失败3已派减", maxLength = 1)
@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减" )
@Length(max = 1, message = "养老办理状态：0待办理1办理成功2办理失败3已派减 4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老办理状态：0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("养老办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
private String pensionHandle;
/**
* 医疗办理状态：0待办理1办理成功2办理失败3已派减
* 医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "医疗办理状态：0待办理1办理成功2办理失败3已派减 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态：0待办理1办理成功2办理失败3已派减", maxLength = 1)
@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减" )
@Length(max = 1, message = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗办理状态：0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("医疗办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
private String medicalHandle;
/**
* 失业办理状态：0待办理1办理成功2办理失败3已派减
* 失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "失业办理状态：0待办理1办理成功2办理失败3已派减 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态：0待办理1办理成功2办理失败3已派减", maxLength = 1)
@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减" )
@Length(max = 1, message = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业办理状态：0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("失业办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
private String unemployHandle;
/**
* 工伤办理状态：0待办理1办理成功2办理失败3已派减
* 工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "工伤办理状态：0待办理1办理成功2办理失败3已派减 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态：0待办理1办理成功2办理失败3已派减", maxLength = 1)
@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减" )
@Length(max = 1, message = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤办理状态：0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("工伤办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
private String workInjuryHandle;
/**
* 生育办理状态：0待办理1办理成功2办理失败3已派减
* 生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "生育办理状态：0待办理1办理成功2办理失败3已派减 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态：0待办理1办理成功2办理失败3已派减", maxLength = 1)
@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减" )
@Length(max = 1, message = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育办理状态：0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("生育办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
private String birthHandle;
/**
* 大病办理状态：0待办理1办理成功2办理失败3已派减
* 大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败
*/
@Length(max = 1, message = "大病办理状态：0待办理1办理成功2办理失败3已派减 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态：0待办理1办理成功2办理失败3已派减", maxLength = 1)
@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减" )
@Length(max = 1, message = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败 不能超过1个字符" )
@ExcelAttribute(name = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败", maxLength = 1)
@Schema(description = "大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病办理状态：0待办理1办理成功2办理失败3已派减" )
@ExcelProperty("大病办理状态：0待办理1办理成功2办理失败3已派减4派减失败" )
private String bigailmentHandle;
/**
* 基数上限（社保或公积金）
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleSearchVo.java
View file @ e6421469
......@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/**
* @Author fxj
......@@ -67,4 +68,11 @@ public class SocialHandleSearchVo extends TDispatchInfo {
@Schema(description = "审核时间截止时间" )
@ExcelIgnore
private String auditTimeEnd;
/**
* 派单项：如 养老、公积金
*/
@ExcelAttribute(name = "派单项查询")
@Schema(description = "派单项查询" )
private List<String> dispatchItems;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoSearchVo.java
View file @ e6421469
......@@ -26,7 +26,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import java.util.Set;
......@@ -110,4 +109,10 @@ public class TDispatchInfoSearchVo extends TDispatchInfo {
@ExcelIgnore
private String auditTimeEnd;
/**
* 派单项：如 养老、公积金
*/
@ExcelAttribute(name = "派单项查询")
@Schema(description = "派单项查询" )
private List<String> dispatchItems;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @ e6421469
......@@ -91,4 +91,8 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
**/
int changeForecastDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
int updateForecastById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
int updateForecastStatusById(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ e6421469
......@@ -206,6 +206,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
**/
@Override
public R<String> createForecastlibary(String payMonths, String empIdCard, String settleDomainIds) {
YifuUser user = SecurityUtils.getUser();
//定义未推送的按条件查询得到的预估数据
List<TForecastLibrary> librarySocialList = null;
//定义已推送的按条件查询得到的预估数据
......@@ -328,7 +329,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
continue;
}
if (Common.isNotNull(library.getId())) {
baseMapper.updateById(library);
library.setUpdateBy(user.getId());
long startTime = System.currentTimeMillis();
baseMapper.updateForecastById(library);
long times = System.currentTimeMillis() - startTime;
log.error("更新一条预估耗时：" + times + "毫秒");
isSaveAndUpdate = true;
} else {
if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
......@@ -1893,8 +1898,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
if (Common.isNotNull(library.getId())) {
library.setUpdateBy(userId);
library.setUpdateTime(LocalDateTime.now());
baseMapper.updateById(library);
long startTime = System.currentTimeMillis();
baseMapper.updateForecastById(library);
long times = System.currentTimeMillis() - startTime;
log.error("更新一条预估耗时：" + times + "毫秒");
isSaveAndUpdate = true;
} else {
if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
......@@ -2249,8 +2256,10 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
if (Common.isNotNull(library.getId())) {
library.setUpdateBy("305");
library.setUpdateTime(LocalDateTime.now());
baseMapper.updateById(library);
long startTime = System.currentTimeMillis();
baseMapper.updateForecastById(library);
long times = System.currentTimeMillis() - startTime;
log.error("更新一条预估耗时：" + times + "毫秒");
} else {
library.setCreateBy("305");
library.setCreateName("定时生成");
......@@ -2452,9 +2461,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
selectVoMap = this.getSelectVoMap();
}
initEkpPushSocialParam(library,synFlag, selectVoMap);
if (null != selectVoMap) {
selectVoMap.clear();
}
}
}
......@@ -2470,9 +2476,6 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
//推送数据封装并推送
initEkpPushFundParam(library,synFlag, selectVoMap);
if (null != selectVoMap) {
selectVoMap.clear();
}
}
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ e6421469
......@@ -317,7 +317,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
return R.ok();
}
/**
* 通过ID获取缴费库 及社保、公积金明细
*
......@@ -3341,7 +3340,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
library.setPaySettleFlag(viewVo.getPaySettleFlag());
library.setPayCollectFlag(viewVo.getPayCollectFlag());
}
tForecastLibraryMapper.updateById(library);
tForecastLibraryMapper.updateForecastStatusById(library);
}
}
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ e6421469
......@@ -291,6 +291,12 @@
</sql>
<sql id="tDispatchInfo_where">
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.idList != null and tDispatchInfo.idList.size >0">
AND a.ID in
<foreach item="idStr" index="index" collection="tDispatchInfo.idList" open="(" separator="," close=")">
......@@ -506,6 +512,12 @@
<sql id="tDispatchInfoAudit_where">
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.idList != null and tDispatchInfo.idList.size >0">
AND a.ID in
<foreach item="idStr" index="index" collection="tDispatchInfo.idList" open="(" separator="," close=")">
......@@ -1062,6 +1074,12 @@
</if>-->
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''">
AND a.TYPE = #{tDispatchInfo.type}
</if>
......@@ -1172,6 +1190,12 @@
</if>-->
<if test="tDispatchInfo != null">
<if test="tDispatchInfo.dispatchItems != null and tDispatchInfo.dispatchItems.size >0">
AND
<foreach item="item" index="index" collection="tDispatchInfo.dispatchItems" open="(" separator="or" close=")">
INSTR(a.DISPATCH_ITEM,#{item})
</foreach>
</if>
<if test="tDispatchInfo.fundProvince != null and tDispatchInfo.fundProvince.trim() != ''">
AND a.FUND_PROVINCE = #{tDispatchInfo.fundProvince}
</if>
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @ e6421469
......@@ -726,4 +726,219 @@
</foreach>
</update>
<!-- 根据id更新 -->
<update id="updateForecastById">
update
t_forecast_library
set
<if test="tForecastLibrary.unitPensionFee != null">
UNIT_PENSION_FEE = #{tForecastLibrary.unitPensionFee},
</if>
<if test="tForecastLibrary.unitMedicalFee != null">
UNIT_MEDICAL_FEE = #{tForecastLibrary.unitMedicalFee},
</if>
<if test="tForecastLibrary.unitUnemploymentFee != null">
UNIT_UNEMPLOYMENT_FEE = #{tForecastLibrary.unitUnemploymentFee},
</if>
<if test="tForecastLibrary.unitWorkInjuryFee != null">
UNIT_WORK_INJURY_FEE = #{tForecastLibrary.unitWorkInjuryFee},
</if>
<if test="tForecastLibrary.unitBirthFee != null">
UNIT_BIRTH_FEE = #{tForecastLibrary.unitBirthFee},
</if>
<if test="tForecastLibrary.unitBitailmentFee != null">
UNIT_BITAILMENT_FEE = #{tForecastLibrary.unitBitailmentFee},
</if>
<if test="tForecastLibrary.personalPensionFee != null">
PERSONAL_PENSION_FEE = #{tForecastLibrary.personalPensionFee},
</if>
<if test="tForecastLibrary.personalMedicalFee != null">
PERSONAL_MEDICAL_FEE = #{tForecastLibrary.personalMedicalFee},
</if>
<if test="tForecastLibrary.personalUnemploymentFee != null">
PERSONAL_UNEMPLOYMENT_FEE = #{tForecastLibrary.personalUnemploymentFee},
</if>
<if test="tForecastLibrary.personalBigailmentFee != null">
PERSONAL_BIGAILMENT_FEE = #{tForecastLibrary.personalBigailmentFee},
</if>
<if test="tForecastLibrary.socialPayMonth != null and tForecastLibrary.socialPayMonth.trim() != ''">
SOCIAL_PAY_MONTH = #{tForecastLibrary.socialPayMonth},
</if>
<if test="tForecastLibrary.socialCreateMonth != null and tForecastLibrary.socialCreateMonth.trim() != ''">
SOCIAL_CREATE_MONTH = #{tForecastLibrary.socialCreateMonth},
</if>
<if test="tForecastLibrary.providentPayMonth != null and tForecastLibrary.providentPayMonth.trim() != ''">
PROVIDENT_PAY_MONTH = #{tForecastLibrary.providentPayMonth},
</if>
<if test="tForecastLibrary.providentCreateMonth != null and tForecastLibrary.providentCreateMonth.trim() != ''">
PROVIDENT_CREATE_MONTH = #{tForecastLibrary.providentCreateMonth},
</if>
<if test="tForecastLibrary.unitSocialSum != null">
UNIT_SOCIAL_SUM = #{tForecastLibrary.unitSocialSum},
</if>
<if test="tForecastLibrary.unitFundSum != null">
UNIT_FUND_SUM = #{tForecastLibrary.unitFundSum},
</if>
<if test="tForecastLibrary.personalSocialSum != null">
PERSONAL_SOCIAL_SUM = #{tForecastLibrary.personalSocialSum},
</if>
<if test="tForecastLibrary.personalFundSum != null">
PERSONAL_FUND_SUM = #{tForecastLibrary.personalFundSum},
</if>
<if test="tForecastLibrary.sumAll != null">
SUM_ALL = #{tForecastLibrary.sumAll},
</if>
<if test="tForecastLibrary.unitPensionBase != null">
UNIT_PENSION_BASE = #{tForecastLibrary.unitPensionBase},
</if>
<if test="tForecastLibrary.unitMedicalBase != null">
UNIT_MEDICAL_BASE = #{tForecastLibrary.unitMedicalBase},
</if>
<if test="tForecastLibrary.unitUnemploymentBase != null">
UNIT_UNEMPLOYMENT_BASE = #{tForecastLibrary.unitUnemploymentBase},
</if>
<if test="tForecastLibrary.unitInjuryBase != null">
UNIT_INJURY_BASE = #{tForecastLibrary.unitInjuryBase},
</if>
<if test="tForecastLibrary.unitBirthBase != null">
UNIT_BIRTH_BASE = #{tForecastLibrary.unitBirthBase},
</if>
<if test="tForecastLibrary.unitBigailmentBase != null">
UNIT_BIGAILMENT_BASE = #{tForecastLibrary.unitBigailmentBase},
</if>
<if test="tForecastLibrary.personalPensionBase != null">
PERSONAL_PENSION_BASE = #{tForecastLibrary.personalPensionBase},
</if>
<if test="tForecastLibrary.personalMedicalBase != null">
PERSONAL_MEDICAL_BASE = #{tForecastLibrary.personalMedicalBase},
</if>
<if test="tForecastLibrary.personalUnemploymentBase != null">
PERSONAL_UNEMPLOYMENT_BASE = #{tForecastLibrary.personalUnemploymentBase},
</if>
<if test="tForecastLibrary.personalBigailmentBase != null">
PERSONAL_BIGAILMENT_BASE = #{tForecastLibrary.personalBigailmentBase},
</if>
<if test="tForecastLibrary.unitPersionPro != null">
UNIT_PERSION_PRO = #{tForecastLibrary.unitPersionPro},
</if>
<if test="tForecastLibrary.unitMedicalPro != null">
UNIT_MEDICAL_PRO = #{tForecastLibrary.unitMedicalPro},
</if>
<if test="tForecastLibrary.unitUnemploymentPro != null">
UNIT_UNEMPLOYMENT_PRO = #{tForecastLibrary.unitUnemploymentPro},
</if>
<if test="tForecastLibrary.unitInjuryPro != null">
UNIT_INJURY_PRO = #{tForecastLibrary.unitInjuryPro},
</if>
<if test="tForecastLibrary.unitBirthPro != null">
UNIT_BIRTH_PRO = #{tForecastLibrary.unitBirthPro},
</if>
<if test="tForecastLibrary.unitBigailmentPro != null">
UNIT_BIGAILMENT_PRO = #{tForecastLibrary.unitBigailmentPro},
</if>
<if test="tForecastLibrary.personalPersionPro != null">
PERSONAL_PERSION_PRO = #{tForecastLibrary.personalPersionPro},
</if>
<if test="tForecastLibrary.personalMedicalPro != null">
PERSONAL_MEDICAL_PRO = #{tForecastLibrary.personalMedicalPro},
</if>
<if test="tForecastLibrary.personalUnemploymentPro != null">
PERSONAL_UNEMPLOYMENT_PRO = #{tForecastLibrary.personalUnemploymentPro},
</if>
<if test="tForecastLibrary.personalBigailmentPro != null">
PERSONAL_BIGAILMENT_PRO = #{tForecastLibrary.personalBigailmentPro},
</if>
<if test="tForecastLibrary.unitFundBase != null">
UNIT_FUND_BASE = #{tForecastLibrary.unitFundBase},
</if>
<if test="tForecastLibrary.personalFundBase != null">
PERSONAL_FUND_BASE = #{tForecastLibrary.personalFundBase},
</if>
<if test="tForecastLibrary.unitFundProp != null">
UNIT_FUND_PROP = #{tForecastLibrary.unitFundProp},
</if>
<if test="tForecastLibrary.personalFundProp != null">
PERSONAL_FUND_PROP = #{tForecastLibrary.personalFundProp},
</if>
<if test="tForecastLibrary.unitInterestFee != null">
UNIT_INTEREST_FEE = #{tForecastLibrary.unitInterestFee},
</if>
<if test="tForecastLibrary.personalInterestFee != null">
PERSONAL_INTEREST_FEE = #{tForecastLibrary.personalInterestFee},
</if>
<if test="tForecastLibrary.socialHousehold != null and tForecastLibrary.socialHousehold.trim() != ''">
SOCIAL_HOUSEHOLD = #{tForecastLibrary.socialHousehold},
</if>
<if test="tForecastLibrary.socialHouseholdName != null and tForecastLibrary.socialHouseholdName.trim() != ''">
SOCIAL_HOUSEHOLD_NAME = #{tForecastLibrary.socialHouseholdName},
</if>
<if test="tForecastLibrary.providentHousehold != null and tForecastLibrary.providentHousehold.trim() != ''">
PROVIDENT_HOUSEHOLD = #{tForecastLibrary.providentHousehold},
</if>
<if test="tForecastLibrary.providentHouseholdName != null and tForecastLibrary.providentHouseholdName.trim() != ''">
PROVIDENT_HOUSEHOLD_NAME = #{tForecastLibrary.providentHouseholdName},
</if>
<if test="tForecastLibrary.salarySocialFlag != null and tForecastLibrary.salarySocialFlag.trim() != ''">
SALARY_SOCIAL_FLAG = #{tForecastLibrary.salarySocialFlag},
</if>
<if test="tForecastLibrary.salaryFundFlag != null and tForecastLibrary.salaryFundFlag.trim() != ''">
SALARY_FUND_FLAG = #{tForecastLibrary.salaryFundFlag},
</if>
<if test="tForecastLibrary.settleDomainId != null and tForecastLibrary.settleDomainId.trim() != ''">
SETTLE_DOMAIN_ID = #{tForecastLibrary.settleDomainId},
</if>
<if test="tForecastLibrary.unitId != null and tForecastLibrary.unitId.trim() != ''">
UNIT_ID = #{tForecastLibrary.unitId},
</if>
<if test="tForecastLibrary.unitName != null and tForecastLibrary.unitName.trim() != ''">
UNIT_NAME = #{tForecastLibrary.unitName},
</if>
<if test="tForecastLibrary.deptName != null and tForecastLibrary.deptName.trim() != ''">
DEPT_NAME = #{tForecastLibrary.deptName},
</if>
<if test="tForecastLibrary.deptNo != null and tForecastLibrary.deptNo.trim() != ''">
DEPT_NO = #{tForecastLibrary.deptNo},
</if>
<if test="tForecastLibrary.empNatrue != null and tForecastLibrary.empNatrue.trim() != ''">
EMP_NATRUE = #{tForecastLibrary.empNatrue},
</if>
SOCIAL_ID = #{tForecastLibrary.socialId},
PROVIDENT_ID = #{tForecastLibrary.providentId},
FUND_PROVINCE = #{tForecastLibrary.fundProvince},
FUND_CITY = #{tForecastLibrary.fundCity},
FUND_TOWN = #{tForecastLibrary.fundTown},
SOCIAL_PROVINCE = #{tForecastLibrary.socialProvince},
SOCIAL_CITY = #{tForecastLibrary.socialCity},
SOCIAL_TOWN = #{tForecastLibrary.socialTown},
DATA_PUSH = #{tForecastLibrary.dataPush},
DATA_TYPE = #{tForecastLibrary.dataType},
DIFF_TYPE = #{tForecastLibrary.diffType},
UPDATE_BY = #{tForecastLibrary.updateBy},
UPDATE_TIME = now()
where
ID = #{tForecastLibrary.id}
</update>
<!-- 根据id更新 -->
<update id="updateForecastStatusById">
update
t_forecast_library
set
<if test="tForecastLibrary.incomeSettleFlag != null and tForecastLibrary.incomeSettleFlag.trim() != ''">
INCOME_SETTLE_FLAG = #{tForecastLibrary.incomeSettleFlag},
</if>
<if test="tForecastLibrary.incomeCollectFlag != null and tForecastLibrary.incomeCollectFlag.trim() != ''">
INCOME_COLLECT_FLAG = #{tForecastLibrary.incomeCollectFlag},
</if>
<if test="tForecastLibrary.paySettleFlag != null and tForecastLibrary.paySettleFlag.trim() != ''">
PAY_SETTLE_FLAG = #{tForecastLibrary.paySettleFlag},
</if>
<if test="tForecastLibrary.payCollectFlag != null and tForecastLibrary.payCollectFlag.trim() != ''">
PAY_COLLECT_FLAG = #{tForecastLibrary.payCollectFlag},
</if>
UPDATE_TIME = now()
where
ID = #{tForecastLibrary.id}
</update>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml
View file @ e6421469
......@@ -168,7 +168,6 @@
<where>
1=1
<include refid="tIncome_where"/>
group by a.id
order by a.CREATE_TIME DESC
</where>
</select>
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ e6421469
......@@ -113,6 +113,14 @@
<result property="workInjuryStart" column="WORK_INJURY_START"/>
<result property="birthStart" column="BIRTH_START"/>
<result property="bigailmentStart" column="BIGAILMENT_START"/>
<result property="pensionReduceStart" column="PENSION_REDUCE_START"/>
<result property="medicalReduceStart" column="MEDICAL_REDUCE_START"/>
<result property="unemployReduceStart" column="UNEMPLOY_REDUCE_START"/>
<result property="workInjuryReduceStart" column="WORK_INJURY_REDUCE_START"/>
<result property="birthReduceStart" column="BIRTH_REDUCE_START"/>
<result property="bigailmentReduceStart" column="BIGAILMENT_REDUCE_START"/>
<result property="pensionHandle" column="PENSION_HANDLE"/>
<result property="medicalHandle" column="MEDICAL_HANDLE"/>
<result property="unemployHandle" column="UNEMPLOY_HANDLE"/>
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @ e6421469
......@@ -110,6 +110,12 @@
<result property="workInjuryStart" column="WORK_INJURY_START"/>
<result property="birthStart" column="BIRTH_START"/>
<result property="bigailmentStart" column="BIGAILMENT_START"/>
<result property="pensionReduceStart" column="PENSION_REDUCE_START"/>
<result property="medicalReduceStart" column="MEDICAL_REDUCE_START"/>
<result property="unemployReduceStart" column="UNEMPLOY_REDUCE_START"/>
<result property="workInjuryReduceStart" column="WORK_INJURY_REDUCE_START"/>
<result property="birthReduceStart" column="BIRTH_REDUCE_START"/>
<result property="bigailmentReduceStart" column="BIGAILMENT_REDUCE_START"/>
<result property="pensionHandle" column="PENSION_HANDLE"/>
<result property="medicalHandle" column="MEDICAL_HANDLE"/>
<result property="unemployHandle" column="UNEMPLOY_HANDLE"/>
......
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