Merge remote-tracking branch 'origin/feature/MVP1.0' into feature/MVP1.0

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

@@ -72,7 +72,7 @@ public class TSettleDomainController {
 	@Operation(summary = "分页查询", description = "分页查询")
 	@GetMapping("/page")
 	public R<IPage<TSettleDomain>> getTSettleDomainPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain) {
-		return R.ok(tSettleDomainService.page(page, Wrappers.query(tSettleDomain)));
+		return R.ok(tSettleDomainService.getPage(page, tSettleDomain));
 	}
 
 	/**
@@ -84,7 +84,7 @@ public class TSettleDomainController {
 	@Operation(summary = "不分页查询", description = "不分页查询")
 	@GetMapping("/noPage")
 	public R<List<TSettleDomain>> getTSettleDomainNoPage(TSettleDomain tSettleDomain) {
-		return R.ok(tSettleDomainService.list(Wrappers.query(tSettleDomain)));
+		return R.ok(tSettleDomainService.getList(tSettleDomain));
 	}
 
 

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

@@ -40,6 +40,8 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
 
+	List<TSettleDomain> getPage(@Param("tSettleDomain") TSettleDomain tSettleDomain);
+
 	IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, @Param("idNameNoVo") IdNameNoVo idNameNoVo);
 	/**
 	 * @param departNo

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

@@ -38,8 +38,25 @@ import java.util.List;
  */
 public interface TSettleDomainService extends IService<TSettleDomain> {
 
+	/**
+	 * @param page
+	 * @param tSettleDomain
+	 * @Description: 分页列表
+	 * @Author: hgw
+	 * @Date: 2022/12/1 14:22
+	 * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain>
+	 **/
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
 
+	/**
+	 * @param tSettleDomain
+	 * @Description: 全部list
+	 * @Author: hgw
+	 * @Date: 2022/12/1 14:22
+	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain>
+	 **/
+	List<TSettleDomain> getList(TSettleDomain tSettleDomain);
+
 	/**
 	 * @param page
 	 * @param idNameNoVo

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

@@ -72,6 +72,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		return baseMapper.getPage(page, tSettleDomain);
 	}
 
+	@Override
+	public List<TSettleDomain> getList(TSettleDomain tSettleDomain) {
+		return baseMapper.getPage(tSettleDomain);
+	}
+
 	@Override
 	public IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, IdNameNoVo idNameNoVo) {
 		return baseMapper.getUnitPage(page, idNameNoVo);

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

@@ -215,6 +215,7 @@
 				and a.STOP_FLAG = #{tSettleDomain.stopFlag}
 			</if>
 		</if>
+		order by CREATE_TIME desc
 	</select>
 
 	<select id="getUnitPage" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo">
@@ -287,8 +288,7 @@
 		a.INVOICE_TITLE_INSURANCE,
 		a.BPO_FLAG
 		FROM t_settle_domain a
-		where 1=1
-			and a.DELETE_FLAG = '0'
+		where a.DELETE_FLAG = '0'
 			<if test="codes != null and codes.size() > 0">
 				and  a.DEPART_NO in
 				<foreach collection="codes" item="param" index="index" open="(" close=")" separator=",">