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 7452ef2..8828b98 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 8fe83de..e7d6acc 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 @@ -70,11 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) )) and GAJGMC = #{GAJGMC} + and ZAFKRQ = #{ZAFKRQ} - AND date_format(d.ZAFKRQ,'%y%m%d') >= date_format(#{params.beginZAFKRQ},'%y%m%d') + and date_format(ZAFKRQ,'%y%m%d') >= date_format(#{params.beginZAFKRQ},'%y%m%d') - AND date_format(d.ZAFKRQ,'%y%m%d') <= date_format(#{params.endZAFKRQ},'%y%m%d') + and date_format(ZAFKRQ,'%y%m%d') <= date_format(#{params.endZAFKRQ},'%y%m%d') and TRXFJLSL = #{TRXFJLSL} and TRXFCLSL = #{TRXFCLSL} diff --git a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbXjxdzhxxbService.java b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbXjxdzhxxbService.java index c0e1518..d820b3a 100644 --- a/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbXjxdzhxxbService.java +++ b/basepro-manager/basepro-manager-interface/src/main/java/basepro/manager/service/ITbXjxdzhxxbService.java @@ -64,4 +64,6 @@ public interface ITbXjxdzhxxbService public int deleteTbXjxdzhxxbById(Long Id); public TbXjxdzhxxb getNumByPctj(String manageDeptId); + + public List xjxdStatics(TbXjxdzhxxb xjxdzhxxb); } diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbXjxdzhxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbXjxdzhxxbServiceImpl.java index 676ebf0..de0ae65 100644 --- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbXjxdzhxxbServiceImpl.java +++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbXjxdzhxxbServiceImpl.java @@ -1,5 +1,6 @@ package basepro.manager.service.impl; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -167,13 +168,18 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService }else { xjxd.setZAPCRYSL(0L); xjxd.setZAPCCLSL(0L); + xjxd.setZHZTRYSL(0L); + xjxd.setQFSFRYSL(0l); } //检查站数量 TbStuck stuck = new TbStuck(); stuck.setDeptId(manageDeptId); - List tbStuckList = stuckMapper.selectTbStuckList(stuck); - xjxd.setYXGAJCZSL(Long.valueOf(tbStuckList.size())); - xjxd.setStuckList(tbStuckList); + stuck.setType("1"); + Long gdk = stuckMapper.selectCount(stuck); + stuck.setType("2"); + Long lsk = stuckMapper.selectCount(stuck); + xjxd.setYXGAJCZSL(gdk); + xjxd.setSLZHKDSL(lsk); SysDept dept = deptMapper.selectDeptById(manageDeptId); if (null != dept){ xjxd.setGAJGDM(dept.getDeptId()); @@ -181,4 +187,20 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService } return xjxd; } + + @Override + public List xjxdStatics(TbXjxdzhxxb xjxdzhxxb) { + RoadCheckStatistics checkStatistics = new RoadCheckStatistics(); + checkStatistics.setDeptId("0"); + List statisticsList = checkStatisticsMapper.getDept(checkStatistics); + List xjxdzhxxbList = new ArrayList<>(); + for (RoadCheckStatistics statistics : statisticsList) { + xjxdzhxxb.setGAJGDM(statistics.getDeptId()); + TbXjxdzhxxb tbXjxdzhxxb = tbXjxdzhxxbMapper.selectCountBySj(xjxdzhxxb); + tbXjxdzhxxb.setGAJGDM(statistics.getDeptId()); + tbXjxdzhxxb.setGAJGMC(statistics.getOrgName()); + xjxdzhxxbList.add(tbXjxdzhxxb); + } + return xjxdzhxxbList; + } } diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java index 2213fd3..51bb1c0 100644 --- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java +++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbMdjfjxxxbController.java @@ -2,6 +2,7 @@ package basepro.manager.controller; import java.util.List; +import basepro.manager.common.annotation.DataScope; import basepro.manager.common.utils.poi.ExcelUtil; import basepro.manager.pojo.TbMdjfjxxxb; import basepro.manager.service.ITbMdjfjxxxbService; @@ -49,6 +50,7 @@ public class TbMdjfjxxxbController extends BaseController */ @RequiresPermissions("system:mdjfjxxxb:list") @PostMapping("/list") + @DataScope(deptAlias = "d") @ResponseBody public TableDataInfo list(TbMdjfjxxxb tbMdjfjxxxb) { diff --git a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbXjxdzhxxbController.java b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbXjxdzhxxbController.java index fb24733..9fe50ef 100644 --- a/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbXjxdzhxxbController.java +++ b/basepro-manager/basepro-manager-web/src/main/java/basepro/manager/controller/TbXjxdzhxxbController.java @@ -62,6 +62,10 @@ public class TbXjxdzhxxbController extends BaseController PageDomain pageDomain = TableSupport.buildPageRequest(); Integer pageNum = pageDomain.getPageNum(); Integer pageSize = pageDomain.getPageSize(); + SysUser user = ShiroUtils.getSysUser(); + if ("340000000000".equals(user.getManageDeptId()) || "0".equals(user.getManageDeptId())){ + + } TableDataInfo info = tbXjxdzhxxbService.selectTbXjxdzhxxbList(tbXjxdzhxxb,pageNum,pageSize); return info; } diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/add.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/add.html index e41620c..72c827c 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/add.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/mdjf/add.html @@ -7,6 +7,7 @@
+
@@ -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