Merge branch 'MVP1.5.4' into MVP1.5.5

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPersonnelRosterSearchVo.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.archives.vo;
+
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TPersonnelRoster;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author fxj
+ * @date 2023-06-13 15:42:17
+ */
+@Data
+public class TPersonnelRosterSearchVo extends TPersonnelRoster {
+
+	/**
+	 * 多选导出或删除等操作
+	 */
+	@Schema(description = "选中ID,多个逗号分割")
+	private String ids;
+
+	/**
+	 * 创建时间区间 [开始时间，结束时间]
+	 */
+	@Schema(description = "创建时间区间")
+	private LocalDateTime[] createTimes;
+	/**
+	 * @Author fxj
+	 * 查询数据起
+	 **/
+	@Schema(description = "查询limit  开始")
+	private int limitStart;
+	/**
+	 * @Author fxj
+	 * 查询数据止
+	 **/
+	@Schema(description = "查询limit  数据条数")
+	private int limitEnd;
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TPersonnelRosterController.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.archives.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TPersonnelRoster;
+import com.yifu.cloud.plus.v1.yifu.archives.service.TPersonnelRosterService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterSearchVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+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 org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * 
+ *
+ * @author fxj
+ * @date 2023-06-13 15:42:17
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tpersonnelroster" )
+@Tag(name = "员工花名册")
+public class TPersonnelRosterController {
+
+    private final TPersonnelRosterService tPersonnelRosterService;
+
+    
+    /**
+     * 简单分页查询
+     * @param page 分页对象
+     * @param tPersonnelRoster 
+     * @return
+     */
+    @Operation(description = "简单分页查询")
+    @GetMapping("/page")
+    public R<IPage<TPersonnelRoster>> getTPersonnelRosterPage(Page<TPersonnelRoster> page, TPersonnelRosterSearchVo tPersonnelRoster) {
+        return  new R<>(tPersonnelRosterService.getTPersonnelRosterPage(page,tPersonnelRoster));
+    }
+    /**
+     * 不分页查询
+     * @param tPersonnelRoster 
+     * @return
+     */
+    @Operation(summary = "不分页查询", description = "不分页查询")
+    @PostMapping("/noPage" )
+    public R<List<TPersonnelRoster>> getTPersonnelRosterNoPage(@RequestBody TPersonnelRosterSearchVo tPersonnelRoster) {
+        return R.ok(tPersonnelRosterService.noPageDiy(tPersonnelRoster));
+    }
+
+    /**
+     * 通过id查询
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('demo_tpersonnelroster_get')")
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('demo_tpersonnelroster_get')" )
+    public R<TPersonnelRoster> getById(@PathVariable("id" ) String id) {
+        return R.ok(tPersonnelRosterService.getById(id));
+    }
+
+    /**
+     * 新增
+     * @param tPersonnelRoster 
+     * @return R
+     */
+    @Operation(summary = "新增", description = "新增：hasPermission('demo_tpersonnelroster_add')")
+    @SysLog("新增" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('demo_tpersonnelroster_add')" )
+    public R<Boolean> save(@RequestBody TPersonnelRoster tPersonnelRoster) {
+        return R.ok(tPersonnelRosterService.save(tPersonnelRoster));
+    }
+
+    /**
+     * 修改
+     * @param tPersonnelRoster 
+     * @return R
+     */
+    @Operation(summary = "修改", description = "修改：hasPermission('demo_tpersonnelroster_edit')")
+    @SysLog("修改" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('demo_tpersonnelroster_edit')" )
+    public R<Boolean> updateById(@RequestBody TPersonnelRoster tPersonnelRoster) {
+        return R.ok(tPersonnelRosterService.updateById(tPersonnelRoster));
+    }
+
+    /**
+     * 通过id删除
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id删除", description = "通过id删除：hasPermission('demo_tpersonnelroster_del')")
+    @SysLog("通过id删除" )
+    @DeleteMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('demo_tpersonnelroster_del')" )
+    public R<Boolean> removeById(@PathVariable String id) {
+        return R.ok(tPersonnelRosterService.removeById(id));
+    }
+
+    /**
+     *  批量导出
+     * @author fxj
+     * @date 2023-06-13 15:42:17
+     **/
+    @Operation(description = "导出 hasPermission('demo_tpersonnelroster-export')")
+    @PostMapping("/export")
+    @PreAuthorize("@pms.hasPermission('demo_tpersonnelroster-export')")
+    public void export(HttpServletResponse response, @RequestBody TPersonnelRosterSearchVo searchVo) {
+            tPersonnelRosterService.listExport(response,searchVo);
+    }
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TPersonnelRosterMapper.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.archives.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TPersonnelRoster;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ *
+ * @author fxj
+ * @date 2023-06-13 15:42:17
+ */
+@Mapper
+public interface TPersonnelRosterMapper extends BaseMapper<TPersonnelRoster> {
+    /**
+     * 简单分页查询
+     * @param tPersonnelRoster 
+     * @return
+     */
+    IPage<TPersonnelRoster> getTPersonnelRosterPage(Page<TPersonnelRoster> page, @Param("tPersonnelRoster") TPersonnelRoster tPersonnelRoster);
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TPersonnelRosterService.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.archives.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TPersonnelRoster;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterSearchVo;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author fxj
+ * @date 2023-06-13 15:42:17
+ */
+public interface TPersonnelRosterService extends IService<TPersonnelRoster> {
+    /**
+     * 简单分页查询
+     * @param tPersonnelRoster 
+     * @return
+     */
+    IPage<TPersonnelRoster> getTPersonnelRosterPage(Page<TPersonnelRoster> page, TPersonnelRosterSearchVo tPersonnelRoster);
+
+    void listExport(HttpServletResponse response, TPersonnelRosterSearchVo searchVo);
+
+    List<TPersonnelRoster> noPageDiy(TPersonnelRosterSearchVo searchVo);
+}

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

@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpChangeInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoNewVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmpChangeInfoVO;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -341,9 +342,35 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	public IPage<TSettleDomain> getAllDeptPagePermission(Page page, String departName, String nameOrNo, String customerId,String flag) {
 		YifuUser user = SecurityUtils.getUser();
 		String userId=user.getId();
+		// SSC开发组-1668092146875969537L  超管1
+		long roleId = 1668092146875969537L;
+		boolean isSsc =	this.haveRole(user, roleId);
+		if (!isSsc) {
+			isSsc =	this.haveRole(user, 1L);
+		}
+		if (isSsc) {
+			userId = "-999";
+		}
 		return tSettleDomainMapper.getPagePerMission(page, userId, departName, nameOrNo, customerId, flag);
 
 	}
+
+	/**
+	 * @Description:  检测是否有某个角色权限
+	 * @Author: hgw
+	 * @Date: 2023/6/12 11:09
+	 * @return: boolean
+	 **/
+	private boolean haveRole(YifuUser user, long roleId) {
+		List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
+		for (Long role : roleList) {
+			if (role == roleId) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * 分页获取所有项目名称
 	 * @return R

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPersonnelRosterServiceImpl.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.archives.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TPersonnelRoster;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPersonnelRosterMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.service.TPersonnelRosterService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterSearchVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TPersonnelRosterVo;
+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 lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * 
+ *
+ * @author fxj
+ * @date 2023-06-13 15:42:17
+ */
+@Log4j2
+@Service
+public class TPersonnelRosterServiceImpl extends ServiceImpl<TPersonnelRosterMapper, TPersonnelRoster> implements TPersonnelRosterService {
+    /**
+     * 简单分页查询
+     * @param tPersonnelRoster 
+     * @return
+     */
+    @Override
+    public IPage<TPersonnelRoster> getTPersonnelRosterPage(Page<TPersonnelRoster> page, TPersonnelRosterSearchVo tPersonnelRoster){
+        return baseMapper.getTPersonnelRosterPage(page,tPersonnelRoster);
+    }
+
+    /**
+     * 批量导出
+     * @param searchVo
+     * @return
+     */
+    @Override
+    public void listExport(HttpServletResponse response, TPersonnelRosterSearchVo searchVo){
+        String fileName = "批量导出" + DateUtil.getThisTime() + ".xlsx";
+        //获取要导出的列表
+        List<TPersonnelRoster> list = new ArrayList<>();
+        long count = noPageCountDiy(searchVo);
+        ServletOutputStream out = null;
+        try {
+            out = response.getOutputStream();
+            response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
+            response.setCharacterEncoding("utf-8");
+            response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName  , CommonConstants.UTF8));
+            // 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
+            //EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
+            ExcelWriter  excelWriter = EasyExcel.write(out, TPersonnelRoster.class).build();
+            int index = 0;
+            if (count >  CommonConstants.ZERO_INT){
+                for (int i = 0; i <= count; ) {
+                    // 获取实际记录
+                    searchVo.setLimitStart(i);
+                    searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
+                    list = noPageDiy(searchVo);
+                    if (Common.isNotNull(list)){
+                        ExcelUtil<TPersonnelRoster> util = new ExcelUtil<>(TPersonnelRoster.class);
+                        for (TPersonnelRoster vo:list){
+                            util.convertEntity(vo,null,null,null);
+                        }
+                    }
+                    if (Common.isNotNull(list)){
+                        WriteSheet writeSheet = EasyExcel.writerSheet(""+index).build();
+                        excelWriter.write(list,writeSheet);
+                        index++;
+                    }
+                    i = i + CommonConstants.EXCEL_EXPORT_LIMIT;
+                    if (Common.isNotNull(list)){
+                        list.clear();
+                    }
+                }
+            }else {
+                WriteSheet writeSheet = EasyExcel.writerSheet(""+index).build();
+                excelWriter.write(list,writeSheet);
+            }
+            if (Common.isNotNull(list)){
+                list.clear();
+            }
+            out.flush();
+            excelWriter.finish();
+        }catch (Exception e){
+            log.error("执行异常" ,e);
+        }finally {
+            try {
+                if (null != out) {
+                    out.close();
+                }
+            } catch (IOException e) {
+                log.error("执行异常", e);
+            }
+        }
+    }
+
+    @Override
+    public List<TPersonnelRoster> noPageDiy(TPersonnelRosterSearchVo searchVo) {
+        LambdaQueryWrapper<TPersonnelRoster> wrapper = buildQueryWrapper(searchVo);
+        List<String> idList = Common.getList(searchVo.getIds());
+        if (Common.isNotNull(idList)){
+            wrapper.in(TPersonnelRoster::getId,idList);
+        }
+        if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0){
+            wrapper.last(" limit "+ searchVo.getLimitStart() +","+ searchVo.getLimitEnd());
+        }
+        wrapper.orderByDesc(BaseEntity::getCreateTime);
+        return baseMapper.selectList(wrapper);
+    }
+
+    private  Long noPageCountDiy(TPersonnelRosterSearchVo searchVo) {
+        LambdaQueryWrapper<TPersonnelRoster> wrapper = buildQueryWrapper(searchVo);
+        List<String> idList = Common.getList(searchVo.getIds());
+        if (Common.isNotNull(idList)){
+            wrapper.in(TPersonnelRoster::getId,idList);
+        }
+        return baseMapper.selectCount(wrapper);
+    }
+
+    private LambdaQueryWrapper buildQueryWrapper(TPersonnelRosterSearchVo entity){
+        LambdaQueryWrapper<TPersonnelRoster> wrapper = Wrappers.lambdaQuery();
+        if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
+            wrapper.ge(TPersonnelRoster::getCreateTime, entity.getCreateTimes()[0])
+                    .le(TPersonnelRoster::getCreateTime,
+                            entity.getCreateTimes()[1]);
+        }
+        if (Common.isNotNull(entity.getCreateName())){
+            wrapper.eq(TPersonnelRoster::getCreateName,entity.getCreateName());
+        }
+        return wrapper;
+    }
+
+}

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -271,10 +271,14 @@
 		<include refid="Base_Column_List"/>
 		FROM
 			t_settle_domain a
+			<if test="userId != null and userId.trim() != '-999'">
 				LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPART_NO
-		WHERE
-			 b.USER_ID = #{userId}
-		  AND a.DELETE_FLAG = '0'
+			</if>
+		WHERE a.DELETE_FLAG = '0'
+		/* 2023-6-12 11:12:15 hgw根据 */
+		<if test="userId != null and userId.trim() != '-999'">
+			AND b.USER_ID = #{userId}
+		</if>
 		<if test="departName != null and departName.trim() != ''">
 			and a.DEPART_NAME like concat("%",#{departName},"%")
 		</if>
@@ -287,9 +291,7 @@
 		<if test="flag != null">
 			and a.STOP_FLAG='0'
 		</if>
-		GROUP BY
-			b.USER_ID,
-			b.SETTLE_DOMAIN_NO
+		GROUP BY a.id
 	</select>
 
 

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

@@ -82,6 +82,7 @@ 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());
 						baseMapper.insert(save);
 					}
 				}
@@ -92,6 +93,7 @@ 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());
 						baseMapper.insert(save);
 					}
 				}

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

@@ -26,6 +26,7 @@ mybatis-plus:
       logic-not-delete-value: 0
   configuration:
     map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 spring:
   application:

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

@@ -101,7 +101,7 @@
 			ekp_ea33075576149bb8a4f5 a
 				LEFT JOIN sys_org_element p on a.fd_3b0aff6781fa86 = p.fd_id
 		WHERE
-			a.ORDER_ID = #{orderId} limit 1
+			a.fd_id = #{orderId} limit 1
 	</select>
 
 	<select id="getMsgByTask"  resultMap="msgInfoMap">

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

@@ -7,7 +7,9 @@ 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;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 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;
 
@@ -23,6 +25,7 @@ import java.io.IOException;
 @RequiredArgsConstructor
 @RequestMapping("/ekp/order")
 @Tag(name = "接收ekp订单相关")
+@Slf4j
 public class EkpOrderController {
 	@Resource
 	private TOrderService tOrderService;
@@ -38,6 +41,9 @@ public class EkpOrderController {
 	@Schema(description = "接收处理ekp订单")
 	@PostMapping(value = "/receiveOrder")
 	public R receiveOrder(OrderAddVO vo) throws IOException {
+		log.error("vo.getCreateTime()111="+vo.getCreateTime());
+		log.error("vo.getCreateTime()222="+vo.getDeptNo());
+		log.error("vo.getCreateTime()333="+vo.getOrderNo());
 		return tOrderService.receiveOrder(vo);
 	}
 

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

@@ -225,7 +225,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 					.eq(TOrderEnclosure::getDeleteFlag, CommonConstants.ZERO_INT)
 			);
 			if (CollectionUtils.isNotEmpty(list)) {
-				List<TOrderEnclosure> listOld = list.stream().filter(e -> CommonConstants.ZERO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
+				List<TOrderEnclosure> fileList = list.stream().filter(e -> CommonConstants.ZERO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> wageList = list.stream().filter(e -> CommonConstants.TWO_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> salaryList = list.stream().filter(e -> CommonConstants.THREE_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> socialList = list.stream().filter(e -> CommonConstants.FOUR_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
@@ -237,8 +237,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 				List<TOrderEnclosure> otherList = list.stream().filter(e -> CommonConstants.TEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 				List<TOrderEnclosure> salaryHandoverList = list.stream().filter(e -> CommonConstants.ELEVEN_INTEGER.equals(e.getEnclosureFlag())).collect(Collectors.toList());
 
-				if (CollectionUtils.isNotEmpty(listOld)) {
-					orderDetailVO.setOrderEnclosure(listOld);
+				if (CollectionUtils.isNotEmpty(fileList)) {
+					orderDetailVO.setOrderEnclosure(fileList);
 				} else {
 					orderDetailVO.setOrderEnclosure(Lists.newArrayList());
 				}
@@ -471,6 +471,9 @@ 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);
 		}
@@ -508,7 +511,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		if (!Common.isEmpty(vo.getOrderContent()) && !ValidityUtil.validate2048(vo.getOrderContent())){
 			return R.failed(OrderConstants.ORDER_CONTENT_MORE_THAN_2048);
 		}
-			TSettleDomain settleDomain = new TSettleDomain();
+		if (CollectionUtils.isEmpty(vo.getHandleUserList())){
+			return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
+		}		TSettleDomain settleDomain = new TSettleDomain();
 
 		List<TSettleDomainSelectVo> settleDomainR;
 		R<TSettleDomainListVo> listVo;