预派单 代码修改

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java

@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -116,6 +117,7 @@ public class TSettleDomain extends BaseEntity {
 	 * 最后审核时间
 	 */
 	@Schema(description = "最后审核时间")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private LocalDateTime lastAuditDate;
 
 	/**
@@ -182,6 +184,7 @@ public class TSettleDomain extends BaseEntity {
 	 * 首次审核通过时间
 	 */
 	@Schema(description = "首次审核通过时间")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private LocalDateTime firstPassTime;
 
 	/**
@@ -218,6 +221,7 @@ public class TSettleDomain extends BaseEntity {
 	 * 停止时间
 	 */
 	@Schema(description = "停止时间")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private LocalDateTime stopDate;
 
 	/**
@@ -284,12 +288,14 @@ public class TSettleDomain extends BaseEntity {
 	 * 审核人审核的时间
 	 */
 	@Schema(description = "审核人审核的时间")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private LocalDateTime auditTime;
 
 	/**
 	 * 经理审核时间
 	 */
 	@Schema(description = "经理审核时间")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private LocalDateTime managerAuditTime;
 
 	/**

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainListVo.java

@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class TSettleDomainListVo {
@@ -12,4 +13,6 @@ public class TSettleDomainListVo {
 	 */
     private List<TSettleDomainSelectVo> listSelectVO;
 
+	private Map<String,TSettleDomainSelectVo> mapSlectVo;
+
 }

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

@@ -35,7 +35,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -149,8 +148,8 @@ public class TSettleDomainController {
 	 **/
 	@Inner
 	@PostMapping("/getSettleDomainSelectVoById")
-	public TSettleDomainSelectVo getInnerSettleDomainSelectVoByUserId(@RequestParam String id) {
-		return tSettleDomainService.selectSettleDomainSelectVosById(id);
+	public TSettleDomainSelectVo getInnerSettleDomainSelectVoByUserId(@RequestBody TSettleDomainSelectVo settleDomainSelectVo) {
+		return tSettleDomainService.selectSettleDomainSelectVosById(settleDomainSelectVo);
 	}
 
 	/**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java

@@ -55,7 +55,7 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 	 * @Author fxj
 	 * @Date 2019-12-24
 	 **/
-	TSettleDomainSelectVo selectSettleDomainSelectVosById(String id);
+	TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo);
 
 	/**
 	 * 获取所有客户单位的结算主体信息

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -87,15 +87,15 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 	}
 
 	/**
-	 * @param id
+	 * @param settleDomainSelectVo
 	 * @Author: wangan
 	 * @Date: 2019/10/18
 	 * @Description: dataCheckDepart
 	 * @return: com.yifu.cloud.v1.hrms.api.vo.TSettleDomainSelectVo
 	 **/
 	@Override
-	public TSettleDomainSelectVo selectSettleDomainSelectVosById(String id) {
-		return baseMapper.selectSettleDomainSelectVosById(id);
+	public TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo) {
+		return baseMapper.selectSettleDomainSelectVosById(settleDomainSelectVo.getId());
 	}
 
 	@Override

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

@@ -11,7 +11,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
 import lombok.extern.log4j.Log4j2;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
@@ -82,7 +81,9 @@ public class ArchivesDaprUtil {
 	 * @return
 	 **/
 	public R<TSettleDomainSelectVo> getSettleDomainSelectVoById(String departId){
-		R<TSettleDomainSelectVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainSelectVoById",departId, Map.class, SecurityConstants.FROM_IN);
+		TSettleDomainSelectVo settleDomainSelectVo = new TSettleDomainSelectVo();
+		settleDomainSelectVo.setId(departId);
+		R<TSettleDomainSelectVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainSelectVoById",settleDomainSelectVo, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){
 			return R.failed("获取派单校验需要的档案信息失败！");
 		}
@@ -97,7 +98,7 @@ public class ArchivesDaprUtil {
 	 * @return
 	 **/
 	public R<TSettleDomainListVo> selectAllSettleDomainSelectVos(){
-		R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/selectAllSettleDomainSelectVos","", Map.class, SecurityConstants.FROM_IN);
+		R<TSettleDomainListVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/selectAllSettleDomainSelectVos","", TSettleDomainListVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){
 			return R.failed("获取所有客户单位的结算主体信息失败！");
 		}