Skip to content

Y
yifu-mvp
Commit 50f0c9c2 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

测试环境校验服务

parent 18a51ffc
Show whitespace changes
Inline Side-by-side
Showing with 296 additions and 111 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java 0 → 100644
View file @ 50f0c9c2
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
/**
* @Author fxj
* @Date 2022/7/20
* @Description 项目结算信息表：包含项目信息 和 客户信息
* @Version 1.0
*/
@Data
public class ProjectSetInfoVo implements Serializable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
/**
* 结算主体编码
*/
@Schema(description = "结算主体编码")
private String departNo;
/**
* 结算主体名称
*/
@Schema(description = "结算主体名称")
private String departName;
/**
* 所属客户
*/
@Schema(description = "所属客户")
private String customerId;
/**
* 客户名称
*/
@Schema(description = "客户名称")
private String customerName;
/**
* 客户编码
*/
@Schema(description = "客户编码")
private String customerCode;
/**
* 商险结算类型：0预估 1 实缴
*/
@Schema(description = "商险结算类型")
private String insuranceSettleType;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java
View file @ 50f0c9c2
......@@ -21,25 +21,31 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpFamily;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpFamilyService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.FamilySearchVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
......@@ -55,8 +61,9 @@ import java.util.List;
@RequestMapping("/tempfamily" )
@Tag(name = "员工家庭信息表管理")
public class TEmpFamilyController {
private final DaprCheckProperties daprCheckProperties;
private final TEmpFamilyService tEmpFamilyService;
@Autowired
private final ArchivesDaprUtil archivesDaprUtil;
/**
* 分页查询
* @param page 分页对象
......@@ -66,6 +73,15 @@ public class TEmpFamilyController {
@Operation(description = "分页查询")
@GetMapping("/page" )
public R<IPage<TEmpFamily>> getTEmpFamilyPage(Page page, FamilySearchVO tEmpFamily) {
List<String> codes = new ArrayList<>();
codes.add("A0001");
codes.add("皖M02002");
codes.add("皖B29203");
codes.add("皖AFA10M");
codes.add("皖AFA11F");
codes.add("皖M02023");
codes.add("皖M02045");
R<Map> res = archivesDaprUtil.getSetInfoByCodes(codes);
return R.ok(tEmpFamilyService.pageDiy(page,tEmpFamily));
}
/**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @ 50f0c9c2
......@@ -433,7 +433,7 @@ public class TEmployeeInfoController {
@Operation(description = "通过身份和编码查询档案 项目档案 合同信息")
@SysLog("通过身份和编码查询档案 项目档案 合同信息")
@Inner
@GetMapping("/getDispatchEmpVo")
@PostMapping("/getDispatchEmpVo")
public Map<String, DispatchEmpVo> getDispatchEmpVo(@RequestBody(required = true)DispatchCheckVo checkVo) {
return tEmployeeInfoService.getDispatchEmpVo(checkVo);
}
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @ 50f0c9c2
......@@ -22,6 +22,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchEmpVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
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.common.core.vo.YifuUser;
......@@ -35,6 +38,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
......@@ -163,4 +167,19 @@ public class TSettleDomainController {
public R<List<TSettleDomainSelectVo>> selectAllSettleDomainSelectVos() {
return new R<>(tSettleDomainService.selectAllSettleDomainSelectVos());
}
/**
* @Author fxj
* @Description 通过结算主体编码获取结算主体及客户信息
* @Date 10:49 2022/7/20
* @Param
* @return
**/
@Operation(description = "通过结算主体编码获取结算主体及客户信息")
@SysLog("通过结算主体编码获取结算主体及客户信息")
@Inner
@PostMapping("/getSetInfoByCodes")
public Map<String, ProjectSetInfoVo> getSetInfoByCodes(@RequestBody(required = true) List<String> codes) {
return tSettleDomainService.getSetInfoByCodes(codes);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
View file @ 50f0c9c2
......@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -50,4 +51,12 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
* @return
**/
List<TSettleDomainSelectVo> selectAllSettleDomainSelectVos();
/**
* @Author fxj
* @Description 通过项目编码获取客户单位的结算主体信息
* @Date 11:08 2022/7/20
* @Param
* @return
**/
List<ProjectSetInfoVo> getSetInfoByCodes(@Param(value = "codes") List<String> codes);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @ 50f0c9c2
......@@ -20,9 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import java.util.List;
import java.util.Map;
/**
* 结算主体表
......@@ -43,6 +45,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
List<String> getSettleDomainIdsByUserId(String id);
Map<String, ProjectSetInfoVo> getSetInfoByCodes(List<String> codes);
/**
* 通过id获取结算主体及单位部分信息
* @param
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ 50f0c9c2
......@@ -2046,7 +2046,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
public Map<String,DispatchEmpVo> getDispatchEmpVo(DispatchCheckVo checkVo) {
List<DispatchEmpVo> voList = baseMapper.getDispatchEmpVo(checkVo);
if (Common.isNotNull(voList)){
return voList.stream().collect(Collectors.toMap(k->k.getEmpIdcard(), k->k));
Map<String,DispatchEmpVo> voMap = new HashMap<>();
for (DispatchEmpVo vo:voList){
voMap.put(vo.getEmpIdcard(),vo);
}
return voMap;
}
return null;
}
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @ 50f0c9c2
......@@ -22,6 +22,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
......@@ -33,6 +34,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
......@@ -100,4 +102,13 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
List<TSettleDomainSelectVo> sdList = baseMapper.selectAllSettleDomainSelectVos();
return sdList;
}
@Override
public Map<String, ProjectSetInfoVo> getSetInfoByCodes(List<String> codes) {
List<ProjectSetInfoVo> voList = baseMapper.getSetInfoByCodes(codes);
if (Common.isNotNull(voList)){
return voList.stream().collect(Collectors.toMap(k->k.getDepartNo(),k->k));
}
return null;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @ 50f0c9c2
......@@ -669,7 +669,7 @@
a.ID_TOWN,a.EMP_REGIS_TYPE,a.FILE_PROVINCE,a.FILE_CITY,a.FILE_TOWN,a.HIGN_EDUCATION,a.FILE_STATUS,
b.CONTRACT_NAME,b.CONTRACT_TYPE,
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,
c.UNIT_NAME,
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST
......@@ -677,6 +677,7 @@
select e.ID,e.EMP_CODE,e.EMP_NATRUE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY,
e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS
from t_employee_info e
where 1=1
<if test="checkVo != null">
<if test="checkVo.idCards != null">
AND e.EMP_IDCARD in
......@@ -687,8 +688,9 @@
</if>
) a
left join (
select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST
select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST,p.EMP_ID
from t_employee_project p
where 1=1
<if test="checkVo != null">
<if test="checkVo.codes != null">
AND p.DEPT_NO in
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @ 50f0c9c2
......@@ -74,7 +74,10 @@
</resultMap>
<sql id="Base_Column_List">
a.ID,
a
.
ID
,
a.DEPART_NO,
a.DEPART_NAME,
a.IS_NEW,
......@@ -188,4 +191,22 @@
LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
where a.DELETE_FLAG = '0'
</select>
<select id="getSetInfoByCodes" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo">
SELECT a.ID,
a.DEPART_NO,
a.DEPART_NAME,
c.ID AS 'customerId',
c.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode'
FROM t_settle_domain a
LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
where 1=1
<if test="codes != null and codes.size() > 0">
and a.DEPART_NO in
<foreach collection="codes" item="param" index="index" open="(" close=")" separator=",">
#{param}
</foreach>
</if>
</select>
</mapper>
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java
View file @ 50f0c9c2
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.alibaba.fastjson.JSON;
import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
......@@ -46,7 +47,21 @@ public class ArchivesDaprUtil {
* @return
**/
public R<Map> getDispatchEmpVo(DispatchCheckVo checkVo){
R<Map> res = HttpDaprUtil.invokeMethodGet(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/getDispatchEmpVo","", Map.class, SecurityConstants.FROM_IN);
R<Map> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/getDispatchEmpVo" , JSON.toJSONString(checkVo), Map.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取档案派单信息失败！");
}
return res;
}
/**
* @Author fxj
* @Description 通过结算主体编码获取结算主体及客户信息
* @Date 21:18 2022/7/20
* @Param
* @return
**/
public R<Map> getSetInfoByCodes(List<String> codes){
R<Map> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSetInfoByCodes",JSON.toJSONString(codes), Map.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取档案派单信息失败！");
}
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 50f0c9c2
......@@ -864,4 +864,12 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("补缴是否采用最新基数0是1否(公积金)" )
private String latestCardinalityFund;
/**
* 公积金停缴日期
*/
@ExcelAttribute(name = "公积金停缴日期", isDate = true)
@Schema(description = "公积金停缴日期" )
@ExcelProperty("公积金停缴日期" )
private Date fundReduceDate;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 50f0c9c2
......@@ -335,6 +335,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue;
}
// 新增派单信息
initDispatchAddInfo(user, dispatchMap, empVo, socialSet, fundSet, excel);
// 变更社保公积金查询
insertExcel(excel);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
}
}
private void initDispatchAddInfo(YifuUser user,
Map<String, TDispatchInfo> dispatchMap,
DispatchEmpVo empVo,
SysBaseSetInfo socialSet,
SysBaseSetInfo fundSet,
TDispatchImportVo excel) {
TDispatchInfo dispatch;
dispatch = new TDispatchInfo();
dispatch.setEmpIdcard(excel.getEmpIdcard());
dispatch.setEmpName(excel.getEmpName());
......@@ -370,7 +385,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setContractTerm(excel.getContractTerm());
dispatch.setContractType(excel.getContractType());
dispatch.setWorkingHours(excel.getWorkingHours());
// 判断
// 派单项信息封装 TODO
// 封装客户信息
if (Common.isNotNull(empVo)){
dispatch.setEmpId(empVo.getId());
......@@ -386,11 +402,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
dispatchMap.put(excel.getEmpIdcard(),dispatch);
// 变更社保公积金查询
insertExcel(excel);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
}
}
private boolean initFundAddInfo(List<ErrorMessage> errorMessageList, List<TProvidentFund> funds, DispatchEmpVo empVo, SysBaseSetInfo fundSet, TDispatchImportVo excel) {
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ 50f0c9c2
......@@ -137,6 +137,7 @@
<result property="trustRemarkFund" column="TRUST_REMARK_FUND"/>
<result property="haveThisMonthFund" column="HAVE_THIS_MONTH_FUND"/>
<result property="latestCardinalityFund" column="LATEST_CARDINALITY_FUND"/>
<result property="fundReduceDate" column="FUND_REDUCE_DATE"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -251,7 +252,8 @@
a.PAY_POLICY_FUND,
a.TRUST_REMARK_FUND,
a.HAVE_THIS_MONTH_FUND,
a.LATEST_CARDINALITY_FUND
a.LATEST_CARDINALITY_FUND,
a.FUND_REDUCE_DATE
</sql>
<sql id="tSocialFundInfo_where">
<if test="tSocialFundInfo != 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