Merge branch 'dev-caomeihuizhang' into container-test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamCaomeiPassportController.java

@@ -41,6 +41,13 @@ public class AdamCaomeiPassportController extends BaseController {
         return getDataTable(pageInfo);
     }
 
+    @RequiresPermissions("adam:caomei:passport:list")
+    @GetMapping("bound/count")
+    @ResponseBody
+    public AjaxResult boundCount() {
+        return AjaxResult.success(adamCaomeiPassportAdminService.countBoundPassports());
+    }
+
     @RequiresPermissions("adam:caomei:passport:list")
     @GetMapping("detail/{passportNo}")
     public String detail(@PathVariable("passportNo") String passportNo, ModelMap mmap) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/passport/passport_list.html

@@ -109,8 +109,39 @@
             ]
         };
         $.table.init(options);
+        setTimeout(function() {
+            renderBoundPassportCountToolbar();
+            loadBoundPassportCount();
+        }, 0);
     });
 
+    function renderBoundPassportCountToolbar() {
+        if ($("#boundPassportCountBox").length > 0) {
+            return;
+        }
+        var html = '' +
+            '<div id="boundPassportCountBox" class="pull-left" style="margin-top: 10px; margin-right: 8px;">' +
+            '  <span style="display: inline-block; line-height: 30px; margin-right: 6px;">已绑定护照数量：<strong id="boundPassportCount">加载中...</strong></span>' +
+            '  <button type="button" class="btn btn-default btn-outline" onclick="loadBoundPassportCount()" title="刷新已绑定护照数量">' +
+            '    <i class="fa fa-refresh"></i>' +
+            '  </button>' +
+            '</div>';
+        var $toolbar = $(".fixed-table-toolbar").first();
+        if ($toolbar.length > 0) {
+            $toolbar.prepend(html);
+        }
+    }
+
+    function loadBoundPassportCount() {
+        $.get(prefix + "/bound/count", function(res) {
+            if (res && res.code === 0) {
+                $("#boundPassportCount").text(res.data || 0);
+            } else {
+                $("#boundPassportCount").text("-");
+            }
+        });
+    }
+
     function openDetail(passportNo) {
         $.modal.openTab("护照详情", prefix + "/detail/" + encodeURIComponent(passportNo));
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/IAdamCaomeiPassportAdminService.java

@@ -12,6 +12,8 @@ public interface IAdamCaomeiPassportAdminService {
 
     PageInfo<AdamCaomeiPassportListVo> listPassports(AdamCaomeiPassportSearchParam param);
 
+    int countBoundPassports();
+
     AdamCaomeiPassportDetailVo getPassportDetail(String passportNo);
 
     boolean unbindPassport(String passportNo);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamCaomeiPassportAdminServiceImpl.java

@@ -72,6 +72,11 @@ public class AdamCaomeiPassportAdminServiceImpl implements IAdamCaomeiPassportAd
         return voPage;
     }
 
+    @Override
+    public int countBoundPassports() {
+        return adamCaomeiPassportMapper.countBoundPassports();
+    }
+
     @Override
     public AdamCaomeiPassportDetailVo getPassportDetail(String passportNo) {
         if (StringUtils.isBlank(passportNo)) {

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamCaomeiPassportMapper.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.adam.dto.AdamCaomeiPassportListDto;
 import com.liquidnet.service.adam.dto.AdamCaomeiPassportUserBadgeDto;
 import com.liquidnet.service.adam.entity.AdamCaomeiPassport;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -17,6 +18,9 @@ public interface AdamCaomeiPassportMapper extends BaseMapper<AdamCaomeiPassport>
                                                             @Param("idCard") String idCard,
                                                             @Param("bindStatus") Integer bindStatus);
 
+    @Select("select count(1) from adam_caomei_passport where status = 1")
+    int countBoundPassports();
+
     List<AdamCaomeiPassportUserBadgeDto> selectUserBadgesByUid(@Param("uid") String uid);
 
     /**