Commit bd79d191 authored by hongguangwu's avatar hongguangwu

1.7.19-优化

parent 9f4da5ab
......@@ -185,7 +185,6 @@ public class TFascTemplate extends BaseEntity {
@ExcelProperty("当前必填总数量")
private String isMustAll;
/**
* 是否删除0否1是
*/
......@@ -195,4 +194,5 @@ public class TFascTemplate extends BaseEntity {
@Schema(description = "是否删除0否1是")
private String deleteFlag;
}
......@@ -16,6 +16,7 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......@@ -55,4 +56,8 @@ public class TFascTemplateSearchVo extends TFascTemplate {
@Schema(description = "查询limit 数据条数")
private int limitEnd;
//必填是否已配置0未配置1部分配置2已配置
@Schema(description = "必填是否已配置多个")
@TableField(exist = false)
private String[] isMustEditArray;
}
......@@ -293,8 +293,10 @@ public class TSettleDomainController {
.eq(TSettleDomain::getDepartNo, tSettleDomainSelectVo.getDepartNo())
.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
BeanUtils.copyProperties(tSettleDomain,tSettleDomainSelectVo);
tSettleDomainSelectVo.setCustomerCode(tSettleDomain.getCustomerNo());
if (tSettleDomain != null) {
BeanUtils.copyProperties(tSettleDomain, tSettleDomainSelectVo);
tSettleDomainSelectVo.setCustomerCode(tSettleDomain.getCustomerNo());
}
list.add(tSettleDomainSelectVo);
TSettleDomainListVo listVo = new TSettleDomainListVo();
listVo.setListSelectVO(list);
......
......@@ -41,11 +41,12 @@ public interface TFascTemplateMapper extends BaseMapper<TFascTemplate> {
* @param tFascTemplate 法大大专业版模板表
* @return
*/
IPage<TFascTemplate> getTFascTemplatePage(Page<TFascTemplate> page, @Param("tFascTemplate") TFascTemplate tFascTemplate);
IPage<TFascTemplate> getTFascTemplatePage(Page<TFascTemplate> page, @Param("tFascTemplate") TFascTemplateSearchVo tFascTemplate);
List<TFascTemplate> getTFascTemplateListAll(@Param("tFascTemplate") TFascTemplate tFascTemplate);
List<TFascTemplate> getTFascTemplateList(@Param("tFascTemplate") TFascTemplate tFascTemplate);
long getTFascTemplateExportCount(@Param("tFascTemplate") TFascTemplateSearchVo tFascTemplate, @Param("idList") List<String> idList);
List<TFascTemplateExportVo> getTFascTemplateExport(@Param("tFascTemplate") TFascTemplateSearchVo tFascTemplate, @Param("idList") List<String> idList);
/**
......
......@@ -101,7 +101,7 @@ public class TFascTemplateServiceImpl extends ServiceImpl<TFascTemplateMapper, T
//获取要导出的列表
List<TFascTemplateExportVo> list = new ArrayList<>();
List<String> idList = Common.getList(searchVo.getIds());
long count = noPageCountDiy(searchVo, idList);
long count = baseMapper.getTFascTemplateExportCount(searchVo, idList);
ServletOutputStream out = null;
try {
out = response.getOutputStream();
......
......@@ -137,6 +137,15 @@
<if test="tFascTemplate.isMustEdit != null and tFascTemplate.isMustEdit.trim() != ''">
AND a.is_must_edit = #{tFascTemplate.isMustEdit}
</if>
<if test="tFascTemplate.isMustEditArray != null and tFascTemplate.isMustEditArray.length > 0">
AND a.is_must_edit in
<foreach item="statusStr" index="index" collection="tFascTemplate.isMustEditArray" open="("
separator="," close=")">
#{statusStr}
</foreach>
</if>
<if test="tFascTemplate.createBy != null and tFascTemplate.createBy.trim() != ''">
AND a.CREATE_BY = #{tFascTemplate.createBy}
</if>
......@@ -222,6 +231,23 @@
</if>
</select>
<!--导出条数-->
<select id="getTFascTemplateExportCount" resultType="java.lang.Long">
SELECT
count(1)
FROM t_fasc_template a
<where>
a.delete_flag = '0'
<include refid="tFascTemplate_where"/>
<if test="idList != null and idList.size>0">
AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
</where>
</select>
<!--获取所有要更新是否必填的模板数据-->
<select id="getTFascTemplateResutList" resultMap="tFascTemplateMap">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment