账期：资金协调手续-获取客户简称列表

@@ -67,6 +67,23 @@ public class CustomerShortController extends DefaultBaseController {
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
     }
 
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"base-data:custome-abbreviation:query"})
+    @GetMapping("/queryShortName")
+    public InvokeResult<PageResult<QueryCustomerShortBo>> queryShortName(@Valid QueryCustomerShortVo vo) {
+        PageResult<CustomerShort> pageResult = customerShortService.queryShortName(getPageIndex(vo), getPageSize(vo), vo);
+        List<CustomerShort> dataList = pageResult.getDatas();
+        List<QueryCustomerShortBo> results = null;
+        if (!CollectionUtil.isEmpty(dataList)) {
+            results = dataList.stream().map(QueryCustomerShortBo::new).collect(Collectors.toList());
+        }
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
     /**
      * 根据ID查询
      */

@@ -51,6 +51,16 @@ public class CustomerShortServiceImpl extends BaseMpServiceImpl<CustomerShortMap
     }
 
     @Override
+    public PageResult<CustomerShort> queryShortName(Integer pageIndex, Integer pageSize, QueryCustomerShortVo vo) {
+        pageIndex = Math.max(pageIndex, 1);
+        pageSize = Math.max(pageSize, 1);
+        int offset = (pageIndex - 1) * pageSize;
+        List<CustomerShort> dataList = getBaseMapper().queryShortName(offset, pageSize, vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
     public CustomerShort findById(String id) {
         return getBaseMapper().selectById(id);
     }

@@ -22,4 +22,14 @@ public interface CustomerShortMapper extends BaseMapper<CustomerShort> {
      * @return      List<CustomerShort>
      */
     List<CustomerShort> query(@Param("vo") QueryCustomerShortVo vo);
+
+
+    /**
+     * 查询列表
+     *
+     * @param vo 查询条件
+     * @return List<CustomerShort>
+     */
+    List<CustomerShort> queryShortName(@Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize,
+                                       @Param("vo") QueryCustomerShortVo vo);
 }

@@ -29,6 +29,14 @@ public interface CustomerShortService extends BaseMpService<CustomerShort> {
     List<CustomerShort> query(QueryCustomerShortVo vo);
 
     /**
+     * 查询列表(根据ShortName去重)
+     *
+     * @param vo 查询条件
+     * @return List<CustomerShort>
+     */
+    PageResult<CustomerShort> queryShortName(Integer pageIndex, Integer pageSize, QueryCustomerShortVo vo);
+
+    /**
      * 根据ID查询
      *
      * @param id    主键ID

@@ -65,4 +65,35 @@
             </if>
         </where>
     </select>
+
+    <select id="queryShortName" resultMap="CustomerShort">
+        SELECT id,
+        short_name,
+        customer_id,
+        type,
+        create_by_id,
+        update_by_id,
+        create_time,
+        update_time
+        FROM (
+        SELECT tb.id,
+        tb.short_name,
+        tb.customer_id,
+        tb.type,
+        tb.create_by_id,
+        tb.update_by_id,
+        tb.create_time,
+        tb.update_time,
+        ROW_NUMBER() OVER (PARTITION BY tb.short_name ORDER BY tb.id) AS rn
+        FROM base_data_customer_short AS tb
+        <where>
+            <if test="vo.shortName != null and vo.shortName != ''">
+                AND tb.short_name LIKE CONCAT('%', #{vo.shortName}, '%')
+            </if>
+        </where>
+        ) t
+        WHERE rn = 1
+        ORDER BY create_time desc
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
 </mapper>

@@ -289,6 +289,15 @@ public class FundCoordinationController extends DefaultBaseController {
                     long daysBetween = ChronoUnit.DAYS.between(bo1.getDueDate(), LocalDate.now());
                     bo1.setTimeout(String.valueOf(daysBetween));
                 }
+                //协调办理日期
+                if (receipt.getCoordinateDate() != null) {
+                    bo1.setCoordinateHandleDate(receipt.getCoordinateDate());
+                }
+                if (receipt.getCoordinateDate() != null && bo1.getDueDate() != null) {
+                    //实际超时(协调办理日期-应办理日期)
+                    long daysBetween = ChronoUnit.DAYS.between(bo1.getDueDate(), receipt.getCoordinateDate());
+                    bo1.setActualTimeout(String.valueOf(daysBetween));
+                }
                 fundOrderingUnitDetailList.add(bo1);
             }
             //排序