Showing
3 changed files
with
6 additions
and
6 deletions
| @@ -92,6 +92,6 @@ public class GetRecapitalizeBo extends BaseBo<Recapitalize> { | @@ -92,6 +92,6 @@ public class GetRecapitalizeBo extends BaseBo<Recapitalize> { | ||
| 92 | protected void afterInit(Recapitalize dto) { | 92 | protected void afterInit(Recapitalize dto) { |
| 93 | SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class); | 93 | SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class); |
| 94 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType()); | 94 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType()); |
| 95 | - dto.setFactoryTypeName(dataDicItem == null ? "" : dataDicItem.getName()); | 95 | + this.factoryTypeName = dataDicItem == null ? "" : dataDicItem.getName(); |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| @@ -92,6 +92,6 @@ public class QueryRecapitalizeBo extends BaseBo<Recapitalize> { | @@ -92,6 +92,6 @@ public class QueryRecapitalizeBo extends BaseBo<Recapitalize> { | ||
| 92 | protected void afterInit(Recapitalize dto) { | 92 | protected void afterInit(Recapitalize dto) { |
| 93 | SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class); | 93 | SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class); |
| 94 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType()); | 94 | SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType()); |
| 95 | - dto.setFactoryTypeName(dataDicItem == null ? "" : dataDicItem.getName()); | 95 | + this.factoryTypeName = dataDicItem == null ? "" : dataDicItem.getName(); |
| 96 | } | 96 | } |
| 97 | } | 97 | } |
| @@ -24,10 +24,10 @@ | @@ -24,10 +24,10 @@ | ||
| 24 | tb.id, | 24 | tb.id, |
| 25 | tb.recapitalize_date, | 25 | tb.recapitalize_date, |
| 26 | tb.ordering_unit, | 26 | tb.ordering_unit, |
| 27 | - tb.ordering_unit_name, | 27 | + cu.name AS ordering_unit_name, |
| 28 | tb.returned_amount, | 28 | tb.returned_amount, |
| 29 | tb.dept_id, | 29 | tb.dept_id, |
| 30 | - tb.dept_name, | 30 | + d.name AS dept_name, |
| 31 | tb.factory_type, | 31 | tb.factory_type, |
| 32 | tb.create_by_id, | 32 | tb.create_by_id, |
| 33 | tb.create_by, | 33 | tb.create_by, |
| @@ -43,10 +43,10 @@ | @@ -43,10 +43,10 @@ | ||
| 43 | <select id="query" resultMap="Recapitalize"> | 43 | <select id="query" resultMap="Recapitalize"> |
| 44 | <include refid="Recapitalize_sql"/> | 44 | <include refid="Recapitalize_sql"/> |
| 45 | <where> | 45 | <where> |
| 46 | - <if test="vo.recapitalizeDateStart != null"> | 46 | + <if test="vo.recapitalizeDateStart != null and vo.recapitalizeDateStart != ''"> |
| 47 | AND tb.recapitalize_date >= #{vo.recapitalizeDateStart} | 47 | AND tb.recapitalize_date >= #{vo.recapitalizeDateStart} |
| 48 | </if> | 48 | </if> |
| 49 | - <if test="vo.recapitalizeDateEnd != null"> | 49 | + <if test="vo.recapitalizeDateEnd != null and vo.recapitalizeDateStart != ''"> |
| 50 | <![CDATA[ | 50 | <![CDATA[ |
| 51 | AND tb.recapitalize_date <= #{vo.recapitalizeDateEnd} | 51 | AND tb.recapitalize_date <= #{vo.recapitalizeDateEnd} |
| 52 | ]]> | 52 | ]]> |