From 466e52648c0bf9a136bc7805d728681094740a63 Mon Sep 17 00:00:00 2001
From: "java_cuibaocheng@163.com" <java_cuibaocheng@163.com>
Date: Thu, 1 Feb 2024 10:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89Excel=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/house/house-mapper.xml     | 16 +++++-----
 .../templates/populationinfo/bind.html        | 29 +++++++++++++++++--
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/house/house-mapper.xml b/src/main/resources/mybatis/mapper/house/house-mapper.xml
index f33e5b2..a374565 100644
--- a/src/main/resources/mybatis/mapper/house/house-mapper.xml
+++ b/src/main/resources/mybatis/mapper/house/house-mapper.xml
@@ -849,13 +849,13 @@
         </if>
         <if test="populationInfoId != null and populationInfoId != ''">
             AND
-            t1.house_id IN (
+                t1.house_id IN (
             SELECT
-            hp.house_id
+                hp.house_id
             FROM
-            house_population hp
+                house_population hp
             WHERE
-            1 = 1
+                hp.is_delete = 0 AND hp.out_house != '1'
             <if test="populationInfoId != null and populationInfoId != ''">
                 AND hp.population_info_id = #{populationInfoId}
             </if>
@@ -863,13 +863,13 @@
         </if>
         <if test="cardNum != null and cardNum != ''">
             AND
-            t1.house_id IN (
+                t1.house_id IN (
             SELECT
-            hp.house_id
+                hp.house_id
             FROM
-            house_population hp
+                house_population hp
             WHERE
-            1 = 1
+                hp.is_delete = 0 AND hp.out_house != '1'
             <if test="cardNum != null and cardNum != ''">
                 AND hp.card_num = #{cardNum}
             </if>
diff --git a/src/main/resources/templates/populationinfo/bind.html b/src/main/resources/templates/populationinfo/bind.html
index 91bb9d7..68314b5 100644
--- a/src/main/resources/templates/populationinfo/bind.html
+++ b/src/main/resources/templates/populationinfo/bind.html
@@ -32,6 +32,7 @@
                             <input type="text" id="name" class="layui-input search-item" placeholder="请输入姓名">
                         </div>
                         <div class="layui-inline layui-form search-item" id="idcardTypeSelectTemplateBox" lay-filter="idcardTypeSelectTemplateBox"></div>
+                        <div class="layui-inline layui-form search-item" id="creatorSelectTemplateBox" lay-filter="creatorSelectTemplateBox"></div>
                         <div class="layui-inline">
                             <input type="text" id="idcard" class="layui-input search-item" placeholder="请输入证件号">
                         </div>
@@ -56,14 +57,22 @@
         </div>
     </div>
 </div>
-<script id="idcardTypeSelectTemplate" type="text/html" lay-search>
-    <select id="idcardType" name="idcardType">
+<script id="idcardTypeSelectTemplate" type="text/html" >
+    <select id="idcardType" name="idcardType" lay-search>
         <option value="">请选择证件类型</option>
         {{# for(var i = 0, item; item = d[i++];) { }}
         <option value="{{item.dictionaryName}}">{{item.dictionaryName}}</option>
         {{# } }}
     </select>
 </script>
+<script id="creatorSelectTemplate" type="text/html" >
+    <select id="creator" name="creator" lay-search>
+        <option value="">请选择认领人员</option>
+        {{# for(var i = 0, item; item = d[i++];) { }}
+        <option value="{{item.userId}}">{{item.userName}}</option>
+        {{# } }}
+    </select>
+</script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script src="assets/js/vendor/viewer/viewer.min.js"></script>
 <script>
@@ -93,6 +102,18 @@
             }
         }, 500);
 
+        // 人员列表
+        function initCreatorSelect() {
+            top.restAjax.get(top.restAjax.path('http://219.147.99.164:8082/datahouse/app/query/sqlrelease/q5d56f90', []), {}, {headers: {PKEY: 'a0a25c1e-818a-489e-98c0-0f3a282a49d2', PPASS: '5be81fdf-2c5d-4ee6-ae45-ffe82b5db2ff'}}, function(code, data, args) {
+                laytpl(document.getElementById('creatorSelectTemplate').innerHTML).render(data, function(html) {
+                    document.getElementById('creatorSelectTemplateBox').innerHTML = html;
+                });
+                form.render('select', 'creatorSelectTemplateBox');
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+
         // 初始化证件类型下拉选择
         function initIdcardTypeSelect() {
             top.restAjax.get(top.restAjax.path('api/datadictionary/listdictionarybyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
@@ -105,6 +126,7 @@
             });
         }
         initIdcardTypeSelect();
+        initCreatorSelect();
 
         // 初始化表格
         function initTable() {
@@ -209,7 +231,8 @@
                 where: {
                     name: $('#name').val(),
                     idcardType: $('#idcardType').val(),
-                    idcard: $('#idcard').val()
+                    idcard: $('#idcard').val(),
+                    creator: $('#creator').val()
                 },
                 page: {
                     curr: currentPage