合同相关\社保公积金相关

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java

@@ -251,8 +251,8 @@ public class TEmployeeInfoController {
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
 	 **/
 	@Inner
-	@GetMapping("/inner/getByEmpId")
-	public TEmployeeInfo getByEmpId(@RequestParam String empId) {
+	@PostMapping("/inner/getByEmpId")
+	public TEmployeeInfo getByEmpId(@RequestBody String empId) {
 		return tEmployeeInfoService.getById(empId);
 	}
 

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java

@@ -118,7 +118,7 @@ public class ArchivesDaprUtil {
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo>
 	 **/
 	public R<TEmployeeInfo> getTEmployeeInfoById(String empId) {
-		R<TEmployeeInfo> res = HttpDaprUtil.invokeMethodGet(
+		R<TEmployeeInfo> res = HttpDaprUtil.invokeMethodPost(
 				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()
 				,"/temployeeinfo/inner/getByEmpId" , empId, TEmployeeInfo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java

@@ -21,13 +21,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -38,9 +37,8 @@ import java.util.Date;
  */
 @Data
 @TableName("t_audit_info" )
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "审核信息表（社保、公积金、预估结算单、社保核准表、公积金核准表 、基数变更 审核记录）" )
-public class TAuditInfo extends BaseEntity {
+public class TAuditInfo implements Serializable {
 
 	/**
 	 * 主键

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java

@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService;
@@ -141,7 +140,7 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
         if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
             wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
         }
-        wrapper.orderByDesc(BaseEntity::getCreateTime);
+        wrapper.orderByDesc(TAuditInfo::getAuditTime);
         return baseMapper.selectList(wrapper);
     }
 
@@ -157,12 +156,12 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
     private LambdaQueryWrapper buildQueryWrapper(TAuditInfoSearchVo entity){
         LambdaQueryWrapper<TAuditInfo> wrapper = Wrappers.lambdaQuery();
         if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-            wrapper.ge(TAuditInfo::getCreateTime, entity.getCreateTimes()[0])
-                    .le(TAuditInfo::getCreateTime,
+            wrapper.ge(TAuditInfo::getAuditTime, entity.getCreateTimes()[0])
+                    .le(TAuditInfo::getAuditTime,
                             entity.getCreateTimes()[1]);
         }
-        if (Common.isNotNull(entity.getCreateName())){
-            wrapper.eq(TAuditInfo::getCreateName,entity.getCreateName());
+        if (Common.isNotNull(entity.getAuditUser())){
+            wrapper.eq(TAuditInfo::getAuditUser,entity.getAuditUser());
         }
         return wrapper;
     }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java

@@ -324,7 +324,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 			// 流程进展明细
 			List<TAuditInfo> auditInfoList = tAuditInfoService.list(Wrappers.<TAuditInfo>query().lambda()
 					.eq(TAuditInfo::getEmpIdcard, socialFundInfo.getEmpIdcard())
-					.orderByDesc(TAuditInfo::getCreateTime));
+					.orderByDesc(TAuditInfo::getAuditTime));
 			detailVo.setAuditList(auditInfoList);
 		}
 		return detailVo;