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

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/config/DaprMsgProperties.java

+package com.yifu.cloud.plus.v1.yifu.common.dapr.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author fxj
+ * @Date 2022/7/4
+ * @Description
+ * @Version 1.0
+ */
+@Data
+@Component
+@PropertySource("classpath:daprConfig.properties")
+@ConfigurationProperties(value = "dapr.msg", ignoreInvalidFields = false)
+public class DaprMsgProperties {
+	/*
+	 * @author fxj
+	 * @date  14:34
+	 * @Description  dapr sidercar url  如：http://localhost:3005/v1.0/invoke/
+	 **/
+	String appUrl;
+	/*
+	 * @author fxj
+	 * @date  14:35
+	 * @decription  app_id  如："yifu_upms_sider"
+	 **/
+	String appId;
+
+	String appPort;
+
+	String httpPort;
+
+	String grpcPort;
+
+	String metricsPort;
+}

yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties

-dapr.upms.appUrl=http://127.0.0.1:3500/v1.0/invoke/
+dapr.upms.appUrl=http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
 dapr.upms.appId=yifu-upms
 
-dapr.check.appUrl=http://127.0.0.1:3500/v1.0/invoke/
+
+#\u6D4B\u8BD5\u73AF\u5883
+#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+#\u672C\u5730
+dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
 dapr.check.appId=yifu-check
 
-#\u751F\u4EA7
-dapr.archives.appUrl=http://127.0.0.1:3500/v1.0/invoke/
-dapr.archives.appId=yifu-archives
 
-#\u751F\u4EA7
-dapr.social.appUrl=http://127.0.0.1:3500/v1.0/invoke/
-dapr.social.appId=yifu-social
+#\u672C\u5730
+dapr.archives.appUrl=http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+dapr.archives.appId=yifu-archives
 
-#\u751F\u4EA7
-dapr.salary.appUrl=http://127.0.0.1:3500/v1.0/invoke/
-dapr.salary.appId=yifu-salary
 
-#\u751F\u4EA7
-dapr.insurances.appUrl=http://127.0.0.1:3500/v1.0/invoke/
-dapr.insurances.appId=yifu-insurances
+dapr.social.appUrl=http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+dapr.social.appId=yifu-social
 
 #\u6D4B\u8BD5\u73AF\u5883-B\u7AEF\u670D\u52A1
-dapr.business.appUrl=http://127.0.0.1:3500/v1.0/invoke/
+dapr.business.appUrl=http://yifu-business.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
 dapr.business.appId=yifu-business
+
+#\u6D4B\u8BD5\u73AF\u5883-\u6D88\u606F\u63D0\u9192\u670D\u52A1
+dapr.msg.appUrl=http://yifu-msg.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+dapr.msg.appId=yifu-msg
\ No newline at end of file

yifu-common/yifu-common-seata/src/main/resources/seata-config.yml

@@ -28,7 +28,7 @@ seata:
     enable-degrade: false # 降级开关
     disable-global-transaction: false # 禁用全局事务（默认false）
     grouplist:
-      default: 192.168.0.153:33091
+      default: 192.168.1.65:33091
   transport:
     shutdown:
       wait: 3

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/MsgTask.java

+package com.yifu.cloud.plus.v1.job.compont;
+
+
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprMsgProperties;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author fxj
+ * @Description 定時任務--定时生成 超时提醒
+ * @Date 19:57 2023/5/30
+ * @Param
+ * @return
+**/
+@Component(value = "msgTask")
+@Slf4j
+@EnableConfigurationProperties(DaprMsgProperties.class)
+public class MsgTask {
+
+	@Autowired
+	private DaprMsgProperties daprMsgProperties;
+
+	/**
+	 * @Author fxj
+	 * @Description 每29分钟刷新 超时待办提醒
+	 * @Date 20:01 2023/5/30
+	 * @Param
+	 * @return
+	**/
+	public void createOderOverTimeMsg() {
+		log.info("-------------每29分钟刷新 超时待办提醒-定时任务开始------------");
+		HttpDaprUtil.invokeMethodPost(daprMsgProperties.getAppUrl(), daprMsgProperties.getAppId(),
+				"/msg/inner/updateOverTimeMsg", "", Object.class,
+				SecurityConstants.FROM_IN);
+		log.info("-------------每29分钟刷新 超时待办提醒定时任务结束------------");
+	}
+}
\ No newline at end of file

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/SalaryTask.java

@@ -127,5 +127,18 @@ public class SalaryTask {
 		log.info("------------定时生成本期申报-定时任务结束------------");
 	}
 
+	/**
+	 * @Author hgw
+	 * @Description 前12月平均工资（MVP-TDC接口）
+	 * @Date 2023-6-19 16:31:32
+	 * @Param
+	 * @return
+	 **/
+	public void doCreateAverageSalary() {
+		log.info("------------定时生成【前12月平均工资】-定时任务开始------------");
+		HttpDaprUtil.invokeMethodPost(daprSalarylProperties.getAppUrl(),daprSalarylProperties.getAppId(),"/taveragesalary/inner/doCreateAverageSalary","", Object.class, SecurityConstants.FROM_IN);
+		log.info("------------定时生成【前12月平均工资】-定时任务结束------------");
+	}
+
 
 }
\ No newline at end of file

yifu-msg/yifu-msg-api/src/main/java/com/yifu/cloud/plus/v1/msg/entity/MsgInfo.java

@@ -22,21 +22,20 @@ 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 java.time.LocalDateTime;
+
 /**
  * @author fxj
  * @date 2023-06-01 10:41:25
  */
 @Data
 @TableName("msg_info")
-@EqualsAndHashCode(callSuper = true)
 @Schema(description = "EKP 消息提醒")
-public class MsgInfo extends BaseEntity {
+public class MsgInfo {
 
 	/**
 	 * id
@@ -46,20 +45,20 @@ public class MsgInfo extends BaseEntity {
 	@Schema(description = "id")
 	private String id;
 	/**
-	 * orderId
+	 * 订单号
 	 */
-	@ExcelAttribute(name = "orderId", maxLength = 50)
+	@ExcelAttribute(name = "订单号", maxLength = 50)
 	@Length(max = 50, message = "orderId不能超过50个字符")
-	@ExcelProperty("orderId")
-	@Schema(description = "orderId")
+	@ExcelProperty("订单号")
+	@Schema(description = "订单号")
 	private String orderId;
 	/**
-	 * 订单号
+	 * URL
 	 */
-	@ExcelAttribute(name = "订单号", maxLength = 200)
-	@Length(max = 200, message = "订单号不能超过200个字符")
-	@ExcelProperty("订单号")
-	@Schema(description = "订单号")
+	@ExcelAttribute(name = "URL", maxLength = 200)
+	@Length(max = 200, message = "URL不能超过200个字符")
+	@ExcelProperty("URL")
+	@Schema(description = "URL")
 	private String url;
 	/**
 	 * 提交人
@@ -85,7 +84,7 @@ public class MsgInfo extends BaseEntity {
 	@Length(max = 1, message = "0 未阅 1 已阅不能超过1个字符")
 	@ExcelProperty("0 未阅 1 已阅")
 	@Schema(description = "0 未阅 1 已阅")
-	private String read;
+	private String readStatus;
 	/**
 	 * 提醒人
 	 */
@@ -95,4 +94,14 @@ public class MsgInfo extends BaseEntity {
 	@Schema(description = "提醒人")
 	private String alertUser;
 
+	private LocalDateTime createTime;
+	/**
+	 * 项目名称
+	 */
+	@ExcelAttribute(name = "项目名称", maxLength = 50)
+	@Length(max = 50, message = "项目名称不能超过1个字符")
+	@ExcelProperty("项目名称")
+	@Schema(description = "项目名称")
+	private String domainName;
+
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/constant/MesConstants.java

@@ -10,13 +10,10 @@ import org.springframework.stereotype.Component;
  * @Description
  * @Version 1.0
  */
-@Component
-@PropertySource("classpath:application.yml")
-@ConfigurationProperties(value = "ekp", ignoreInvalidFields = false)
 public interface MesConstants {
 	/**
 	 * 項目订单URL
 	**/
-	String orderUrl ="";
+	String orderUrl ="http://36.7.147.19:28080/sys/modeling/main/modelingAppView.do?method=modelView&listviewId=185943766d6e9ff50d8fea1414eaf460&fdId=";
 
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/controller/MsgInfoController.java

@@ -86,7 +86,7 @@ public class MsgInfoController {
 	@Operation(summary = "每29分钟刷新 超时待办提醒", description = "每29分钟刷新 超时待办提醒")
 	@Inner
 	@PostMapping("/inner/updateOverTimeMsg")
-	public void everyMonthUpdateSalaryStatus() {
+	public void updateOverTimeMsg() {
 		msgInfoService.updateOverTimeMsg();
 	}
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.msg.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,9 +31,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 /**
  * 
  *
@@ -82,8 +88,9 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 					if (Common.isNotNull(save)){
 						save.setCreateTime(LocalDateTime.now());
 						save.setUrl(MesConstants.orderUrl+vo.getOrderId());
-						save.setUrl(vo.getAlertUser());
+						save.setAlertUser(vo.getAlertUser().replace("\"",""));
 						baseMapper.insert(save);
+						log.error(JSON.toJSONString(save));
 					}
 				}
 				// 变更提醒
@@ -93,8 +100,9 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 						save.setCreateTime(LocalDateTime.now());
 						save.setUrl(MesConstants.orderUrl+save.getOrderId());
 						save.setAlertType(CommonConstants.TWO_STRING);
-						save.setUrl(vo.getAlertUser());
+						save.setAlertUser(vo.getAlertUser().replace("\"",""));
 						baseMapper.insert(save);
+						log.error(JSON.toJSONString(save));
 					}
 				}
 			}
@@ -110,18 +118,41 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 	 * @Param
 	 * @return
 	 **/
+	@Transactional
 	@Override
 	public void updateOverTimeMsg() {
+		// 1. 删除未读的超时，如果有继续生成
+		baseMapper.delete(Wrappers.<MsgInfo>query().lambda()
+				.eq(MsgInfo::getReadStatus,CommonConstants.ZERO_STRING)
+				.eq(MsgInfo::getAlertType,CommonConstants.ONE_STRING));
+		List<MsgInfo>  temps = baseMapper.selectList(Wrappers.<MsgInfo>query().lambda()
+				.eq(MsgInfo::getAlertType,CommonConstants.ONE_STRING)
+				.eq(MsgInfo::getReadStatus,CommonConstants.ONE_STRING));
+		Map<String,MsgInfo> tempMap = new HashMap<>();
+		if (Common.isNotNull(temps)){
+			for (MsgInfo msg:temps){
+				tempMap.put(msg.getOrderNo(),msg);
+			}
+		}
 		List<MsgInfo>  msgInfos = baseMapper.getMsgByTask();
+		List<MsgInfo>  saves = new ArrayList<>();
 		if (Common.isNotNull(msgInfos)){
-			//1.先删除
-			baseMapper.delete(Wrappers.<MsgInfo>query().lambda().eq(MsgInfo::getAlertType,CommonConstants.ONE_STRING));
 			//2. 重新生成
+			MsgInfo temp;
 			for (MsgInfo ms:msgInfos){
+				temp = tempMap.get(ms.getOrderNo());
+				if (Common.isNotNull(temp)){
+					tempMap.remove(ms.getOrderNo());
+					continue;
+				}
 				ms.setCreateTime(LocalDateTime.now());
 				ms.setUrl(MesConstants.orderUrl+ms.getOrderId());
+				saves.add(ms);
+			}
+			if (Common.isNotNull(tempMap)){
+				this.removeByIds(tempMap.values());
 			}
-			this.saveBatch(msgInfos);
+			this.saveBatch(saves);
 		}
 	}
 }

yifu-msg/yifu-msg-biz/src/main/resources/application.yml

@@ -64,6 +64,3 @@ springdoc:
     - group: mail
       #按包路径匹配
       packagesToScan: com.yifu.cloud.plus.v1.msg.controller
-
-ekp:
-  orderUrl: http://36.7.147.19:28080/sys/modeling/main/modelingAppView.do?method=modelView&listviewId=185943766d6e9ff50d8fea1414eaf460&fdId=
\ No newline at end of file

yifu-msg/yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml

@@ -30,8 +30,9 @@
     <result property="orderNo" column="ORDER_NO"/>
     <result property="alertType" column="ALERT_TYPE"/>
     <result property="createTime" column="CREATE_TIME"/>
-    <result property="read" column="READ"/>
+    <result property="readStatus" column="READ_STATUS"/>
     <result property="alertUser" column="ALERT_USER"/>
+	<result property="domainName" column="DOMAIN_NAME"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -40,8 +41,9 @@
                 a.ORDER_NO,
                 a.ALERT_TYPE,
                 a.CREATE_TIME,
-                a.READ,
-                a.ALERT_USER
+                a.READ_STATUS,
+                a.ALERT_USER,
+				a.DOMAIN_NAME
     </sql>
     <sql id="msgInfo_where">
         <if test="msgInfo != null">
@@ -63,8 +65,8 @@
                     <if test="msgInfo.createTime != null">
                         AND a.CREATE_TIME = #{msgInfo.createTime}
                     </if>
-                    <if test="msgInfo.read != null and msgInfo.read.trim() != ''">
-                        AND a.READ = #{msgInfo.read}
+                    <if test="msgInfo.readStatus != null and msgInfo.readStatus.trim() != ''">
+                        AND a.READ_STATUS = #{msgInfo.readStatus}
                     </if>
                     <if test="msgInfo.alertUser != null and msgInfo.alertUser.trim() != ''">
                         AND a.ALERT_USER = #{msgInfo.alertUser}
@@ -93,31 +95,38 @@
 
 	<select id="getMsgByOrderId" resultMap="msgInfoMap">
 		SELECT
-			p.fd_name alertUser,
-			a.fd_3ac901c5184274  orderNo,
-			a.fd_id  orderId,
-			'0' as alertType
+			a.fd_3ac901ba3b9d3e domain_name,
+			p.fd_name ALERT_USER,
+			a.fd_3ac901c5184274  ORDER_NO,
+			a.fd_id  ORDER_ID,
+			'0' as ALERT_TYPE
 		FROM
 			ekp_ea33075576149bb8a4f5 a
 				LEFT JOIN sys_org_element p on a.fd_3b0aff6781fa86 = p.fd_id
 		WHERE
 			a.fd_id = #{orderId} limit 1
 	</select>
-
-	<select id="getMsgByTask"  resultMap="msgInfoMap">
-		select
 	<!--  加急（2-3小时）|1  紧急（3-5小时）|4  常规（5-8小时）|7  -->
-		o.fd_name alertUser,
-		b1.fd_3ac901c5184274  orderNo,
-		b1.fd_id  orderId,
-		'1' as alertType
-		FROM lbpm_workitem a
-		LEFT JOIN lbpm_node  e on e.fd_id= a.fd_node_id
-		LEFT JOIN lbpm_process p on p.fd_id=e.fd_process_id
-		LEFT JOIN ekp_ea33075576149bb8a4f5 b1 on p.fd_model_id=b1.fd_id
-		LEFT JOIN sys_org_element o on o.fd_id=fd_expected_id
-		where
-		e.fd_fact_node_id='N5' and  b1.fd_id is not null;
-		and DATE_ADD(NOW(),INTERVAL 30 MINUTE) > IF(b1.fd_3b779ba2168eea=1,DATE_ADD(a.fd_start_date,INTERVAL 3 HOUR),IF(b1.fd_3b779ba2168eea=4,DATE_ADD(a.fd_start_date,INTERVAL 5 HOUR),DATE_ADD(a.fd_start_date,INTERVAL 8 HOUR)))
+	<select id="getMsgByTask"  resultMap="msgInfoMap">
+		SELECT * from (
+		SELECT
+			b1.fd_3ac901ba3b9d3e domain_name,
+			o.fd_no ALERT_USER,
+			b1.fd_3ac901c5184274 ORDER_NO,
+			b1.fd_id ORDER_ID,
+			'1' AS ALERT_TYPE,
+			DATE_ADD(NOW(), INTERVAL 30 MINUTE)  as  'date1',
+		IF(b1.fd_3b779ba2168eea = 1,DATE_ADD(a.fd_start_date,INTERVAL 3 HOUR),IF(b1.fd_3b779ba2168eea = 4,DATE_ADD(a.fd_start_date,INTERVAL 5 HOUR),DATE_ADD(a.fd_start_date,INTERVAL 8 HOUR))) as 'date2'
+		FROM
+			lbpm_workitem a
+		LEFT JOIN lbpm_node e ON e.fd_id = a.fd_node_id
+		LEFT JOIN lbpm_process p ON p.fd_id = e.fd_process_id
+		LEFT JOIN ekp_ea33075576149bb8a4f5 b1 ON p.fd_model_id = b1.fd_id
+		LEFT JOIN sys_org_element o ON o.fd_id = fd_expected_id
+		WHERE
+			e.fd_fact_node_id = 'N5'
+		AND b1.fd_id IS NOT NULL
+		) x
+		where x.date1 > date2
 	</select>
 </mapper>

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAttVo.java

+package com.yifu.cloud.plus.v1.yifu.order.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+
+@Data
+public class OrderAttVo implements Serializable {
+
+	private static final long serialVersionUID = 6620652346415180825L;
+
+
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+
+	/**
+	 * 订标识
+	 */
+	@Schema(description = "唯一标识")
+	private String file1;
+
+
+	/**
+	 * 附件
+	 */
+	@Schema(description = "附件")
+	private MultipartFile[] file;
+
+}

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/EkpOrderController.java

@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.order.controller;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.order.service.TOrderService;
 import com.yifu.cloud.plus.v1.yifu.order.vo.OrderAddVO;
+import com.yifu.cloud.plus.v1.yifu.order.vo.OrderAttVo;
 import com.yifu.cloud.plus.v1.yifu.order.vo.OrderReplyAddVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -47,6 +49,21 @@ public class EkpOrderController {
 		return tOrderService.receiveOrder(vo);
 	}
 
+
+	/**
+	 * 接收处理ekp
+	 *
+	 * @author licancan
+	 * @param vo
+	 * @return {@link R}
+	 * @throws IOException
+	 */
+	@Schema(description = "接收处理ekp附件")
+	@PostMapping(value = "/receiveOrderNew")
+	public R receiveOrder(OrderAttVo vo) throws IOException {
+		return tOrderService.receiveOrderNew(vo);
+	}
+
 	/**
 	 * 接收处理ekp订单回复
 	 *

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderService.java

@@ -99,6 +99,18 @@ public interface TOrderService extends IService<TOrder> {
 	 */
 	R receiveOrder(OrderAddVO vo) throws IOException;
 
+
+
+	/**
+	 * 接收处理ekp附件
+	 *
+	 * @author licancan
+	 * @param vo
+	 * @return {@link R}
+	 * @throws IOException
+	 */
+	R receiveOrderNew(OrderAttVo vo ) throws IOException;
+
 	/**
 	 * 接收处理ekp订单回复
 	 *

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -276,17 +276,17 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				if (CollectionUtils.isNotEmpty(withHoldingList)) {
 					orderDetailVO.setWithHoldingEnclosure(withHoldingList);
 				} else {
-					orderDetailVO.setFundEnclosure(Lists.newArrayList());
+					orderDetailVO.setWithHoldingEnclosure(Lists.newArrayList());
 				}
 
 				if (CollectionUtils.isNotEmpty(collectionList)) {
 					orderDetailVO.setCollectionEnclosure(collectionList);
 				} else {
-					orderDetailVO.setFundEnclosure(Lists.newArrayList());
+					orderDetailVO.setCollectionEnclosure(Lists.newArrayList());
 
 				}
 				if (CollectionUtils.isNotEmpty(noTaxList)) {
-					orderDetailVO.setCollectionEnclosure(noTaxList);
+					orderDetailVO.setNoTaxEnclosure(noTaxList);
 				} else {
 					orderDetailVO.setNoTaxEnclosure(Lists.newArrayList());
 
@@ -471,9 +471,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R receiveOrder(OrderAddVO vo) throws IOException{
-		log.error("vo.getCreateTime()="+vo.getCreateTime());
-		log.error("vo.getDeptNo()="+vo.getDeptNo());
-		log.error("vo.getOrderNo()="+vo.getOrderNo());
+
 		if (Common.isEmpty(vo.getOrderNo())){
 			return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
 		}
@@ -514,7 +512,15 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
 			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
 		}		TSettleDomain settleDomain = new TSettleDomain();
-
+		if(vo.getUrgencyExtent().equals(CommonConstants.ONE_STRING)){
+             vo.setUrgencyExtent("加急(2-3小时)");
+		}
+		if(vo.getUrgencyExtent().equals(CommonConstants.FOUR_STRING)){
+			vo.setUrgencyExtent("紧急(3-5小时)");
+		}
+		if(vo.getUrgencyExtent().equals(CommonConstants.SEVEN_STRING)){
+			vo.setUrgencyExtent("常规(5-8小时)");
+		}
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;
 		listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(vo.getDeptNo());
@@ -573,8 +579,72 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 			}
 		}
 
-		if (save && ArrayUtils.isNotEmpty(vo.getWageFile())){
-			for (MultipartFile multipartFile : vo.getWageFile()) {
+
+
+		return R.ok(OrderConstants.OPERATE_SUCCESS);
+	}
+
+
+	/**
+	 * 接收处理ekp订单回复
+	 *
+	 * @author licancan
+	 * @param vo
+	 * @return {@link R}
+	 * @throws IOException
+	 */
+	@Override
+	public R receiveOrderReply(OrderReplyAddVO vo) throws IOException{
+		if (Common.isEmpty(vo.getOrderNo())){
+			return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
+		}
+		TOrder one = this.getOne(Wrappers.<TOrder>query().lambda()
+				.eq(TOrder::getOrderNo, vo.getOrderNo())
+				.eq(TOrder::getDeleteFlag,CommonConstants.ZERO_INT)
+				.last(CommonConstants.LAST_ONE_SQL)
+		);
+		if (!Optional.ofNullable(one).isPresent()){
+			return R.failed(OrderConstants.ORDER_NO_NOT_EXIST);
+		}else {
+			if (CommonConstants.TWO_INT == one.getOrderStatus()){
+				return R.failed(OrderConstants.ORDER_STATUS_IS_TWO);
+			}
+		}
+		if (Common.isEmpty(vo.getCreateName())){
+			return R.failed(OrderConstants.REPLY_NAME_IS_EMPTY);
+		}
+		if (Common.isEmpty(vo.getCreateTime())){
+			return R.failed(OrderConstants.REPLY_TIME_IS_EMPTY);
+		}
+		if (Common.isEmpty(vo.getReplyContent()) && ArrayUtils.isEmpty(vo.getFile())){
+			return R.failed(OrderConstants.REPLY_CONTENT_AND_ENCLOSURE_IS_EMPTY);
+		}
+		// 校验回复内容2048字以内
+		if (!Common.isEmpty(vo.getReplyContent()) && !ValidityUtil.validate2048(vo.getReplyContent())){
+			return R.failed(OrderConstants.REPLY_CONTENT_MORE_THAN_2048);
+		}
+
+		if (ArrayUtils.isNotEmpty(vo.getFile())){
+			if (vo.getFile().length > CommonConstants.TWENTY_INT){
+				return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
+			}
+			for (MultipartFile multipartFile : vo.getFile()) {
+				if(!Common.checkInsuranceFile(multipartFile.getOriginalFilename())){
+					return R.failed(OrderConstants.ENCLOSURE_TYPE_IS_ERROR);
+				}
+				if (multipartFile.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
+					return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
+				}
+			}
+
+		}
+		TOrderReply reply = new TOrderReply();
+		BeanUtils.copyProperties(vo,reply);
+		reply.setReplyContent(Common.isEmpty(vo.getReplyContent())?null:vo.getReplyContent());
+		reply.setDeleteFlag(CommonConstants.ZERO_INT);
+		boolean save = tOrderReplyService.save(reply);
+		if (save && ArrayUtils.isNotEmpty(vo.getFile())){
+			for (MultipartFile multipartFile : vo.getFile()) {
 				String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 				//filePath不传默认存储空间的根目录
 				//支持的附件格式
@@ -583,15 +653,15 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				if (flag) {
 					log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 					TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+					orderEnclosure.setOrderNo(reply.getId());
 					orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.TWO_INTEGER);
+					orderEnclosure.setEnclosureFlag(CommonConstants.ONE_INT);
 					orderEnclosure.setEnclosureAddress(key);
 					orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 					try {
 						tOrderEnclosureService.save(orderEnclosure);
 					} catch (Exception e) {
-						log.error("订单接收OSS文件上传接口异常：" + e.getMessage());
+						log.error("订单回复接收OSS文件上传接口异常：" + e.getMessage());
 						ossUtil.deleteObject(null, key);
 						return R.failed("failed:" + e.getMessage());
 					}
@@ -600,9 +670,40 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				}
 			}
 		}
+		return R.ok(OrderConstants.OPERATE_SUCCESS);
+	}
+
+	/**
+	 * 接收处理ekp订单回复
+	 *
+	 * @author licancan
+	 * @param vo
+	 * @return {@link R}
+	 * @throws IOException
+	 */
+	@Override
+	public R receiveOrderNew(OrderAttVo vo) throws IOException{
+		if (Common.isEmpty(vo.getOrderNo())){
+			return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
+		}
+
+		if (ArrayUtils.isNotEmpty(vo.getFile())){
+			if (vo.getFile().length > CommonConstants.TWENTY_INT){
+				return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
+			}
+			for (MultipartFile multipartFile : vo.getFile()) {
+				if(!Common.checkInsuranceFile(multipartFile.getOriginalFilename())){
+					return R.failed(OrderConstants.ENCLOSURE_TYPE_IS_ERROR);
+				}
+				if (multipartFile.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
+					return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
+				}
+			}
 
-		if (save && ArrayUtils.isNotEmpty(vo.getSalaryFile())){
-			for (MultipartFile multipartFile : vo.getWageFile()) {
+		}
+		if (vo.getFile1().equals("fileOne")) {
+		  if (ArrayUtils.isNotEmpty(vo.getFile())) {
+			  for (MultipartFile multipartFile : vo.getFile()) {
 				  String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 				  //filePath不传默认存储空间的根目录
 				  //支持的附件格式
@@ -611,9 +712,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				  if (flag) {
 					  log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 					  TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+					  orderEnclosure.setOrderNo(vo.getOrderNo());
 					  orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.THREE_INTEGER);
+					  orderEnclosure.setEnclosureFlag(CommonConstants.TWO_INTEGER);
 					  orderEnclosure.setEnclosureAddress(key);
 					  orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 					  try {
@@ -628,9 +729,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				  }
 			  }
 		  }
-
-		if (save && ArrayUtils.isNotEmpty(vo.getSocialFile())){
-			for (MultipartFile multipartFile : vo.getSocialFile()) {
+		}
+		if (vo.getFile1().equals("fileTwo")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -639,9 +741,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.FOUR_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.THREE_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -656,8 +758,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getFundFile())){
-			for (MultipartFile multipartFile : vo.getFundFile()) {
+		}
+		if (vo.getFile1().equals("fileThree")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -666,9 +770,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.FIVE_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.FOUR_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -683,8 +787,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getInsuranceFile())){
-			for (MultipartFile multipartFile : vo.getInsuranceFile()) {
+		}
+		if (vo.getFile1().equals("fileFour")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -693,9 +799,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.SIX_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.FIVE_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -710,8 +816,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getWithHoldingFile())){
-			for (MultipartFile multipartFile : vo.getWithHoldingFile()) {
+		}
+		if (vo.getFile1().equals("fileFive")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -720,9 +828,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.SEVEN_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.SIX_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -737,8 +845,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getCollectionFile())){
-			for (MultipartFile multipartFile : vo.getCollectionFile()) {
+		}  if (vo.getFile1().equals("fileSix")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -747,9 +856,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.EIGHT_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.SEVEN_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -764,8 +873,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getNoTaxFile())){
-			for (MultipartFile multipartFile : vo.getNoTaxFile()) {
+		}
+		if (vo.getFile1().equals("fileSeven")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -774,9 +885,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.NINE_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.EIGHT_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -791,8 +902,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getOtherFile())){
-			for (MultipartFile multipartFile : vo.getOtherFile()) {
+		}
+		if (vo.getFile1().equals("fileEight")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -801,9 +914,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.TEN_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.NINE_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -818,8 +931,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		if (save && ArrayUtils.isNotEmpty(vo.getSalaryHandoverFile())){
-			for (MultipartFile multipartFile : vo.getOtherFile()) {
+		}
+		if (vo.getFile1().equals("fileNine")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
+				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
 					//支持的附件格式
@@ -828,9 +943,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(order.getOrderNo());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.ELEVEN_INTEGER);
+						orderEnclosure.setEnclosureFlag(CommonConstants.TEN_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
@@ -845,70 +960,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-
-		return R.ok(OrderConstants.OPERATE_SUCCESS);
-	}
-
-
-	/**
-	 * 接收处理ekp订单回复
-	 *
-	 * @author licancan
-	 * @param vo
-	 * @return {@link R}
-	 * @throws IOException
-	 */
-	@Override
-	public R receiveOrderReply(OrderReplyAddVO vo) throws IOException{
-		if (Common.isEmpty(vo.getOrderNo())){
-			return R.failed(OrderConstants.ORDER_NO_IS_EMPTY);
-		}
-		TOrder one = this.getOne(Wrappers.<TOrder>query().lambda()
-				.eq(TOrder::getOrderNo, vo.getOrderNo())
-				.eq(TOrder::getDeleteFlag,CommonConstants.ZERO_INT)
-				.last(CommonConstants.LAST_ONE_SQL)
-		);
-		if (!Optional.ofNullable(one).isPresent()){
-			return R.failed(OrderConstants.ORDER_NO_NOT_EXIST);
-		}else {
-			if (CommonConstants.TWO_INT == one.getOrderStatus()){
-				return R.failed(OrderConstants.ORDER_STATUS_IS_TWO);
-			}
-		}
-		if (Common.isEmpty(vo.getCreateName())){
-			return R.failed(OrderConstants.REPLY_NAME_IS_EMPTY);
-		}
-		if (Common.isEmpty(vo.getCreateTime())){
-			return R.failed(OrderConstants.REPLY_TIME_IS_EMPTY);
-		}
-		if (Common.isEmpty(vo.getReplyContent()) && ArrayUtils.isEmpty(vo.getFile())){
-			return R.failed(OrderConstants.REPLY_CONTENT_AND_ENCLOSURE_IS_EMPTY);
-		}
-		// 校验回复内容2048字以内
-		if (!Common.isEmpty(vo.getReplyContent()) && !ValidityUtil.validate2048(vo.getReplyContent())){
-			return R.failed(OrderConstants.REPLY_CONTENT_MORE_THAN_2048);
-		}
-
-		if (ArrayUtils.isNotEmpty(vo.getFile())){
-			if (vo.getFile().length > CommonConstants.TWENTY_INT){
-				return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
-			}
-			for (MultipartFile multipartFile : vo.getFile()) {
-				if(!Common.checkInsuranceFile(multipartFile.getOriginalFilename())){
-					return R.failed(OrderConstants.ENCLOSURE_TYPE_IS_ERROR);
-				}
-				if (multipartFile.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
-					return R.failed(OrderConstants.ENCLOSURE_SIZE_ERROR);
-				}
-			}
-
 		}
-		TOrderReply reply = new TOrderReply();
-		BeanUtils.copyProperties(vo,reply);
-		reply.setReplyContent(Common.isEmpty(vo.getReplyContent())?null:vo.getReplyContent());
-		reply.setDeleteFlag(CommonConstants.ZERO_INT);
-		boolean save = tOrderReplyService.save(reply);
-		if (save && ArrayUtils.isNotEmpty(vo.getFile())){
+		if (vo.getFile1().equals("fileTen")) {
+			if (ArrayUtils.isNotEmpty(vo.getFile())) {
 				for (MultipartFile multipartFile : vo.getFile()) {
 					String fileName = System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename();
 					//filePath不传默认存储空间的根目录
@@ -918,15 +972,15 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					if (flag) {
 						log.info("文件：" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功！");
 						TOrderEnclosure orderEnclosure = new TOrderEnclosure();
-					orderEnclosure.setOrderNo(reply.getId());
+						orderEnclosure.setOrderNo(vo.getOrderNo());
 						orderEnclosure.setEnclosureName(multipartFile.getOriginalFilename());
-					orderEnclosure.setEnclosureFlag(CommonConstants.ONE_INT);
+						orderEnclosure.setEnclosureFlag(CommonConstants.ELEVEN_INTEGER);
 						orderEnclosure.setEnclosureAddress(key);
 						orderEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
 						try {
 							tOrderEnclosureService.save(orderEnclosure);
 						} catch (Exception e) {
-						log.error("订单回复接收OSS文件上传接口异常：" + e.getMessage());
+							log.error("订单接收OSS文件上传接口异常：" + e.getMessage());
 							ossUtil.deleteObject(null, key);
 							return R.failed("failed:" + e.getMessage());
 						}
@@ -935,9 +989,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					}
 				}
 			}
-		return R.ok(OrderConstants.OPERATE_SUCCESS);
 		}
 
+
+		return R.ok(OrderConstants.OPERATE_SUCCESS);
+	}
 	public R invalidOrder(String id) {
 		TOrder one = baseMapper.selectById(id);
 		if (Common.isNotNull(one) && CommonConstants.ZERO_INT != one.getOrderStatus()) {

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TAverageSalary.java

+package com.yifu.cloud.plus.v1.yifu.salary.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+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 io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 前12月平均工资（MVP-TDC接口）
+ * 保留上月与本月，删除上上月数据，用以比对差异部分，推送到TDC
+ *
+ * @author hgw
+ * @date 2023-6-19 15:54:50
+ */
+@Getter
+@Setter
+@TableName("t_average_salary")
+@Tag(name = "前12月平均工资")
+public class TAverageSalary implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "id")
+	private String id;
+	/**
+	 * 身份证号
+	 */
+	@ExcelAttribute(name = "身份证号", maxLength = 25)
+	@Length(max = 25, message = "身份证号不能超过25个字符")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+	/**
+	 * 应发薪酬（劳务费、稿酬）
+	 */
+	@ExcelAttribute(name = "应发薪酬")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("应发薪酬")
+	private BigDecimal averageSalary;
+
+	/**
+	 * 结算月
+	 */
+	@ExcelAttribute(name = "生成月", isNotEmpty = true, errorInfo = "生成月不能为空", maxLength = 6)
+	@NotBlank(message = "生成月不能为空")
+	@Length(max = 6, message = "生成月不能超过20个字符")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("生成月")
+	private String createMonth;
+}

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TAverageSalaryVo.java

+package com.yifu.cloud.plus.v1.yifu.salary.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 前12月平均工资（MVP-TDC接口）
+ * 保留上月与本月，删除上上月数据，用以比对差异部分，推送到TDC
+ *
+ * @author hgw
+ * @date 2023-6-19 15:54:50
+ */
+@Data
+public class TAverageSalaryVo implements Serializable {
+
+	/**
+	 * 身份证号
+	 */
+	@ExcelAttribute(name = "身份证号", maxLength = 25)
+	@Length(max = 25, message = "身份证号不能超过25个字符")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+	/**
+	 * 应发薪酬（劳务费、稿酬）
+	 */
+	@ExcelAttribute(name = "应发薪酬")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("应发薪酬")
+	private BigDecimal averageSalary;
+
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TAverageSalaryController.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.salary.controller;
+
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock;
+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.security.annotation.Inner;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TAverageSalaryService;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TAverageSalaryVo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 前12月平均工资（MVP-TDC接口）
+ *
+ * @author hgw
+ * @date 2023-6-19 16:27:44
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/taveragesalary")
+@Tag(name = "前12月平均工资（MVP-TDC接口）")
+public class TAverageSalaryController {
+
+	private final TAverageSalaryService tAverageSalaryService;
+
+	/**
+	 * @Description: 定时任务-前12月平均工资
+	 * @Author: hgw
+	 * @Date: 2023-6-19 16:29:50
+	 * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
+	 **/
+	@Inner
+	@Operation(description = "定时任务-前12月平均工资")
+	@PostMapping("/inner/doCreateAverageSalary")
+	public void doCreateAverageSalary() {
+		tAverageSalaryService.createAverageSalary();
+	}
+	/**
+	 * @Author fxj
+	 * @Description 获取-前12月平均工资数据
+	 * @Date 10:20 2023/6/20
+	 * @Param
+	 * @return
+	**/
+	@Operation(description = "获取-前12月平均工资数据")
+	@GetMapping("/getAverageSalary")
+	public R<List<TAverageSalaryVo>> getAverageSalary(String idNum) {
+		// 获取redis分布式事务锁
+		String key = CacheConstants.PAYMENT_DISPATCH_BATCH_ADD_IMPORT + CommonConstants.DOWN_LINE_STRING + "getAverageSalary";
+		String requestId;
+		try {
+			requestId = RedisDistributedLock.getLock(key,"10");
+		} catch (Exception e) {
+			throw new RuntimeException(ResultConstants.NO_GETLOCK_DATA+CommonConstants.DOWN_LINE_STRING+e.getMessage());
+		}
+		try {
+			if (Common.isNotNull(requestId)) {
+				//主动释放锁
+				return tAverageSalaryService.getAverageSalary(idNum);
+			} else {
+				return R.failed(ResultConstants.NO_GETLOCK_DATA);
+			}
+		}finally {
+			//主动释放锁
+			RedisDistributedLock.unlock(key, requestId);
+		}
+
+	}
+
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TAverageSalaryMapper.java

+package com.yifu.cloud.plus.v1.yifu.salary.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TAverageSalary;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TAverageSalaryVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 前12月平均工资（MVP-TDC接口）
+ *
+ * @author hgw
+ * @date 2023-6-19 16:24:41
+ */
+@Mapper
+public interface TAverageSalaryMapper extends BaseMapper<TAverageSalary> {
+
+	/**
+	 * 删除多余的数据
+	 *
+	 * @return
+	 */
+	int deleteByCreateMonth();
+
+	/**
+	 * @param
+	 * @Description: 新增新数据
+	 * @Author: hgw
+	 * @Date: 2023/6/19 16:10
+	 * @return: int
+	 **/
+	int insertAverageSalary();
+
+	/**
+	 * @return
+	 * @Author fxj
+	 * @Description 获取-前12月平均工资数据     取值增量
+	 * @Date 10:26 2023/6/20
+	 * @Param
+	 **/
+	List<TAverageSalaryVo> getAverageSalary(@Param("idNum") List<String> idNum);
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TAverageSalaryService.java

+package com.yifu.cloud.plus.v1.yifu.salary.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TAverageSalary;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TAverageSalaryVo;
+
+import java.util.List;
+
+/**
+ * @Author hgw
+ * @Description 前12月平均工资（MVP-TDC接口）
+ * @Date 2023-6-19 16:25:54
+ **/
+public interface TAverageSalaryService extends IService<TAverageSalary> {
+
+	/**
+	 * @Description: 删除本月与上上月数据，生成本月数据
+	 * @Author: hgw
+	 * @Date: 2023/6/19 16:26
+	 * @return: void
+	 **/
+	void createAverageSalary();
+
+	R<List<TAverageSalaryVo>> getAverageSalary(String idNum);
+}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TAverageSalaryServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.salary.service.impl;
+
+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.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TAverageSalary;
+import com.yifu.cloud.plus.v1.yifu.salary.mapper.TAverageSalaryMapper;
+import com.yifu.cloud.plus.v1.yifu.salary.service.TAverageSalaryService;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TAverageSalaryVo;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author hgw
+ * @Description 前12月平均工资（MVP-TDC接口）
+ * @Date 2023-6-19 16:25:16
+ **/
+@Service("tAverageSalaryService")
+public class TAverageSalaryServiceImpl extends ServiceImpl<TAverageSalaryMapper, TAverageSalary> implements TAverageSalaryService {
+
+	/**
+	 * @Description: 删除本月与上上月数据，生成本月数据
+	 * @Author: hgw
+	 * @Date: 2023/6/19 16:32
+	 * @return: void
+	 **/
+	@Override
+	public void createAverageSalary() {
+		baseMapper.deleteByCreateMonth();
+		baseMapper.insertAverageSalary();
+	}
+
+	/**
+	 * @return
+	 * @Author fxj
+	 * @Description 获取-前12月平均工资数据
+	 * @Date 10:25 2023/6/20
+	 * @Param
+	 **/
+	@Override
+	public R<List<TAverageSalaryVo>> getAverageSalary(String idNum) {
+		return R.ok(baseMapper.getAverageSalary(Common.getList(idNum)), CommonConstants.RESULT_DATA_SUCESS);
+	}
+
+}
+
+
+
+

yifu-salary/yifu-salary-biz/src/main/resources/application.yml

@@ -39,6 +39,7 @@ security:
         - /v3/api-docs
         - /actuator/**
         - /swagger-ui/**
+        - /taveragesalary/getAverageSalary
 
 
 

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TAverageSalaryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.salary.mapper.TAverageSalaryMapper">
+
+	<resultMap id="tAverageSalaryMap" type="com.yifu.cloud.plus.v1.yifu.salary.entity.TAverageSalary">
+		<id property="id" column="ID"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="averageSalary" column="AVERAGE_SALARY"/>
+		<result property="createMonth" column="CREATE_MONTH"/>
+	</resultMap>
+
+	<resultMap id="tAverageSalaryVoMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TAverageSalaryVo">
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="averageSalary" column="AVERAGE_SALARY"/>
+	</resultMap>
+
+	<!-- 删除不需要的数据 -->
+	<delete id="deleteByCreateMonth">
+		delete
+		from t_average_salary
+		where CREATE_MONTH in (
+							   DATE_FORMAT(now(), '%Y%m'), DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 2 MONTH), '%Y%m')
+			)
+	</delete>
+
+	<!-- 生成需要的数据 -->
+	<insert id="insertAverageSalary">
+		insert into t_average_salary
+		select CONCAT(DATE_FORMAT(now(), '%Y%m-'), a.ID)                                 ID
+			 , a.EMP_IDCARD
+			 , round(sum(a.RELAY_SALARY) / ifnull(count(DISTINCT a.SALARY_MONTH), 1), 2) AVERAGE_SALARY
+			 , DATE_FORMAT(now(), '%Y%m')                                                CREATE_MONTH
+		from t_salary_account a
+		where a.SALARY_MONTH >= date_format(DATE_SUB(NOW(), INTERVAL 1 YEAR), '%Y%m')
+		GROUP BY a.EMP_IDCARD
+	</insert>
+
+	<select id="getAverageSalary" resultMap="tAverageSalaryVoMap">
+		select x.* from
+		(select a.EMP_IDCARD,a.AVERAGE_SALARY from view_average_cur_month a) x
+		LEFT JOIN
+		(select a.EMP_IDCARD,a.AVERAGE_SALARY from view_average_last_month a) y
+		on x.EMP_IDCARD=y.EMP_IDCARD
+		where (x.AVERAGE_SALARY <![CDATA[ <>  ]]> IFNULL(y.AVERAGE_SALARY,-1))
+		<if test="idNum != null and idNum.size > 0">
+			AND x.EMP_IDCARD in
+			<foreach item="item" index="index" collection="idNum" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
+</mapper>