楚江ERP:账期-回笼资金

@@ -92,6 +92,6 @@ public class GetRecapitalizeBo extends BaseBo<Recapitalize> {
     protected void afterInit(Recapitalize dto) {
         SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
         SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType());
-        dto.setFactoryTypeName(dataDicItem == null ? "" : dataDicItem.getName());
+        this.factoryTypeName = dataDicItem == null ? "" : dataDicItem.getName();
     }
 }

@@ -92,6 +92,6 @@ public class QueryRecapitalizeBo extends BaseBo<Recapitalize> {
     protected void afterInit(Recapitalize dto) {
         SysDataDicItemService sysDataDicItemService = ApplicationUtil.getBean(SysDataDicItemService.class);
         SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("SUPPLIER", dto.getFactoryType());
-        dto.setFactoryTypeName(dataDicItem == null ? "" : dataDicItem.getName());
+        this.factoryTypeName = dataDicItem == null ? "" : dataDicItem.getName();
     }
 }

@@ -24,10 +24,10 @@
             tb.id,
             tb.recapitalize_date,
             tb.ordering_unit,
-            tb.ordering_unit_name,
+            cu.name AS ordering_unit_name,
             tb.returned_amount,
             tb.dept_id,
-            tb.dept_name,
+            d.name AS dept_name,
             tb.factory_type,
             tb.create_by_id,
             tb.create_by,
@@ -43,10 +43,10 @@
     <select id="query" resultMap="Recapitalize">
         <include refid="Recapitalize_sql"/>
         <where>
-            <if test="vo.recapitalizeDateStart != null">
+            <if test="vo.recapitalizeDateStart != null and vo.recapitalizeDateStart != ''">
                 AND tb.recapitalize_date >= #{vo.recapitalizeDateStart}
             </if>
-            <if test="vo.recapitalizeDateEnd != null">
+            <if test="vo.recapitalizeDateEnd != null and vo.recapitalizeDateStart != ''">
                 <![CDATA[
                AND tb.recapitalize_date <= #{vo.recapitalizeDateEnd}
                 ]]>