档案优化

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

@@ -64,6 +64,7 @@ public class TSettleDomainController {
 	 * @param tSettleDomain 项目表
 	 * @return
 	 */
+	// 	2022-9-27 16:36:56hgw备注：前端用这个接口模糊搜索项目信息：/yifu-archives/method/tempchangeinfo/getAllDeptPage
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page")
 	public R<IPage<TSettleDomain>> getTSettleDomainPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -18,9 +18,11 @@
 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.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.archives.vo.TSettleDomainSelectVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,6 +37,7 @@ import java.util.List;
 @Mapper
 public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
+	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
 	/**
 	 * @param departNo
 	 * @Author: wangan

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

@@ -17,16 +17,16 @@
 
 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.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 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.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 项目表
@@ -35,6 +35,9 @@ import java.util.Map;
  * @date 2022-06-20 10:02:28
  */
 public interface TSettleDomainService extends IService<TSettleDomain> {
+
+	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
+
 	/**
 	 * 清除userId的项目权限缓存
 	 *

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

@@ -308,7 +308,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	private LambdaQueryWrapper buildQueryWrapper(String deptName) {
 		LambdaQueryWrapper<TSettleDomain> wrapper = Wrappers.lambdaQuery();
 		if (Common.isNotNull(deptName)) {
-			wrapper.likeRight(TSettleDomain::getDepartName, deptName);
+			wrapper.like(TSettleDomain::getDepartName, deptName);
 		}
 		wrapper.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING);
 		wrapper.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING);

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

@@ -16,7 +16,9 @@
  */
 package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
 
+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.admin.api.entity.SysArea;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
@@ -62,6 +64,12 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 	private UpmsDaprUtils upmsDaprUtils;
 
 	private final TCutsomerDataPermissonMapper permissonMapper;
+
+	@Override
+	public IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
+		return baseMapper.getPage(page, tSettleDomain);
+	}
+
 	/**
 	 * @Author fxj
 	 * @Description 清除项目缓存

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

@@ -295,7 +295,7 @@
 					AND a.EMP_NATRUE = #{tEmployeeInfo.empNatrue}
 				</if>
 				<if test="tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''">
-					AND a.EMP_NAME = #{tEmployeeInfo.empName}
+					AND a.EMP_NAME like concat('%',#{tEmployeeInfo.empName},'%')
 				</if>
 				<if test="tEmployeeInfo.empIdcard != null and tEmployeeInfo.empIdcard.trim() != ''">
 					AND a.EMP_IDCARD = #{tEmployeeInfo.empIdcard}

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

@@ -196,6 +196,27 @@
 		<result property="bpoFlag" column="BPO_FLAG"/>
 	</resultMap>
 
+	<select id="getPage" resultMap="tSettleDomainMap">
+		SELECT
+			<include refid="Base_Column_List"/>
+		FROM t_settle_domain a
+		WHERE 1=1
+		<if test="tSettleDomain != null">
+			<if test="tSettleDomain.departName != null and tSettleDomain.departName.trim() != ''">
+				and a.DEPART_NAME like concat('%', #{tSettleDomain.departName} ,'%')
+			</if>
+			<if test="tSettleDomain.departNo != null and tSettleDomain.departNo.trim() != ''">
+				and a.DEPART_NO = #{tSettleDomain.departNo}
+			</if>
+			<if test="tSettleDomain.deleteFlag != null and tSettleDomain.deleteFlag.trim() != ''">
+				and a.DELETE_FLAG = #{tSettleDomain.deleteFlag}
+			</if>
+			<if test="tSettleDomain.stopFlag != null and tSettleDomain.stopFlag.trim() != ''">
+				and a.STOP_FLAG = #{tSettleDomain.stopFlag}
+			</if>
+		</if>
+	</select>
+
 	<select id="selectSettleDomainSelectVosById"
 			resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
 		SELECT