From 206fd8337a85fd935078488c90aaaf6fe845dbe4 Mon Sep 17 00:00:00 2001 From: luyya Date: Fri, 12 Jul 2024 19:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=BD=A6=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basepro/manager/mapper/TbStuckMapper.java | 2 +- .../manager/mapper/TbXjxdzhxxbMapper.java | 2 + .../mybatis/mapper/TbMdjfjxxxbMapper.xml | 16 ++++- .../mybatis/mapper/TbStuckMapper.xml | 5 +- .../mybatis/mapper/TbXjxdzhxxbMapper.xml | 27 +++++++++ .../manager/service/ITbXjxdzhxxbService.java | 2 + .../service/impl/TbXjxdzhxxbServiceImpl.java | 28 ++++++++- .../controller/TbMdjfjxxxbController.java | 2 + .../controller/TbXjxdzhxxbController.java | 4 ++ .../main/resources/templates/mdjf/add.html | 41 ++++++++++--- .../main/resources/templates/mdjf/edit.html | 59 ++++++++++++------- .../resources/templates/mdjf/mdjfjxxxb.html | 58 +++++++++++++----- .../main/resources/templates/xjxd/add.html | 2 +- .../resources/templates/xjxd/xjxdzhxxb.html | 42 +++++++++++-- 14 files changed, 232 insertions(+), 58 deletions(-) diff --git a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbStuckMapper.java b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbStuckMapper.java index 823c7df..4d66c81 100644 --- a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbStuckMapper.java +++ b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbStuckMapper.java @@ -77,6 +77,6 @@ public interface TbStuckMapper List selectTbStuckByDept2(String deptId); - Long selectCount(String deptId); + Long selectCount(TbStuck stuck); } diff --git a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbXjxdzhxxbMapper.java b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbXjxdzhxxbMapper.java index cba41ab..953f9a6 100644 --- a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbXjxdzhxxbMapper.java +++ b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/TbXjxdzhxxbMapper.java @@ -59,4 +59,6 @@ public interface TbXjxdzhxxbMapper * @return 结果 */ public int deleteTbXjxdzhxxbByIds(String[] Ids); + + public TbXjxdzhxxb selectCountBySj(TbXjxdzhxxb xjxdzhxxb); } diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml index 2ca2abf..6f6800c 100644 --- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml +++ b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbMdjfjxxxbMapper.xml @@ -31,8 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select count(id) from tb_stuck - AND (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) )) + AND (dept_id = #{deptId} OR dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) )) + and type = #{type} diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml index 37953c8..8e2a5e1 100644 --- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml +++ b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/TbXjxdzhxxbMapper.xml @@ -71,6 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and GAJGMC = #{GAJGMC} and ZAFKRQ = #{ZAFKRQ} + + and date_format(ZAFKRQ,'%y%m%d') >= date_format(#{params.beginZAFKRQ},'%y%m%d') + + + and date_format(ZAFKRQ,'%y%m%d') <= date_format(#{params.endZAFKRQ},'%y%m%d') + and TRXFJLSL = #{TRXFJLSL} and TRXFCLSL = #{TRXFCLSL} and QFQZSL = #{QFQZSL} @@ -110,6 +116,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and CHWP_GZDJ = #{ChwpGzdj} + +
@@ -134,19 +135,14 @@
- +
- +
-
- -
- -
-
+
@@ -229,6 +225,35 @@ minView: 0, autoclose: true }); + + function selectDeptTree() { + var treeId = $("#treeId").val(); + var deptId = $.common.isEmpty(treeId) ? "340000000000" : $("#treeId").val(); + var type = 4; + var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type; + var options = { + title: '选择机构', + width: "380", + url: url, + callBack: doSubmit + }; + $.modal.openOptions(options); + } + + function doSubmit(index, layero){ + var tree = layero.find("iframe")[0].contentWindow.$._tree; + var body = layer.getChildFrame('body', index); + var treedeptId = body.find('#treeId').val(); + if (treedeptId.substr(4)=='00000000') { + $.modal.msgError("市局单位下无法建卡点"); + return ; + } + $("#treeId").val(body.find('#treeId').val()); + $("#treeName").val(body.find('#treeName').val()); + layer.close(index); + + } + \ No newline at end of file diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/edit.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/edit.html index 5e1565e..18f8f8f 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/edit.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/edit.html @@ -8,6 +8,7 @@
+
@@ -135,19 +136,14 @@
- +
- +
-
- -
- -
-
+
@@ -209,29 +205,52 @@ } } - $("input[name='fssj']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", + $("input[name='fssjStr']").datetimepicker({ + format: "yyyy-mm-dd hh:ii:ss", + minView: 0, autoclose: true }); - $("input[name='djsj']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", + $("input[name='djsjStr']").datetimepicker({ + format: "yyyy-mm-dd hh:ii:ss", + minView: 0, autoclose: true }); - $("input[name='tcsj']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", + $("input[name='tcsjStr']").datetimepicker({ + format: "yyyy-mm-dd hh:ii:ss", + minView: 0, autoclose: true }); - $("input[name='jlgxsj']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", + $("input[name='jlgxsjStr']").datetimepicker({ + format: "yyyy-mm-dd hh:ii:ss", + minView: 0, autoclose: true }); + + function selectDeptTree() { + var treeId = $("#treeId").val(); + var deptId = $.common.isEmpty(treeId) ? "340000000000" : $("#treeId").val(); + var type = 4; + var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type; + var options = { + title: '选择机构', + width: "380", + url: url, + callBack: doSubmit + }; + $.modal.openOptions(options); + } + + function doSubmit(index, layero){ + var tree = layero.find("iframe")[0].contentWindow.$._tree; + var body = layer.getChildFrame('body', index); + $("#treeId").val(body.find('#treeId').val()); + $("#treeName").val(body.find('#treeName').val()); + layer.close(index); + + } \ No newline at end of file diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/mdjfjxxxb.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/mdjfjxxxb.html index c6caa5c..1d7de16 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/mdjfjxxxb.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/mdjfjxxxb.html @@ -10,24 +10,25 @@
+
  • - +
  • - +
  • - + + +
  • - - + + - - +
  • - + +
diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html index d69d021..c8ae4c7 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/xjxdzhxxb.html @@ -10,6 +10,7 @@
+
@@ -40,15 +41,15 @@ 添加 - + 删除 - +
@@ -260,6 +261,35 @@ }; $.table.init(options); }); + + function reset() { + $("#treeId").val(""); + $.form.reset() + } + + function selectDeptTree() { + var treeId = $("#treeId").val(); + var deptId = $.common.isEmpty(treeId) ? "340000000000" : treeId; + var type = 1; + var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type; + var options = { + title: '选择机构', + width: "380", + height: "620", + url: url, + callBack: doSubmit + }; + $.modal.openOptions(options); + } + function doSubmit(index, layero){ + var tree = layero.find("iframe")[0].contentWindow.$._tree; + var body = layer.getChildFrame('body', index); + $("#treeId").val(body.find('#treeId').val()); + $("#treeName").val(body.find('#treeName').val()); + layer.close(index); + + } + \ No newline at end of file