diff --git a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/RoadCheckStatisticsMapper.java b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/RoadCheckStatisticsMapper.java index 7246407..2fb1536 100644 --- a/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/RoadCheckStatisticsMapper.java +++ b/basepro-manager/basepro-manager-dao/src/main/java/basepro/manager/mapper/RoadCheckStatisticsMapper.java @@ -16,6 +16,8 @@ public interface RoadCheckStatisticsMapper { public RoadCheckStatistics getStuckCheckStatistics(RoadCheckStatistics roadCheckStatistics); - public RoadCheckStatistics getCheckStatistics(RoadCheckStatistics roadCheckStatistics); + public List getCheckStatistics(RoadCheckStatistics roadCheckStatistics); + + public RoadCheckStatistics getRoadStatistics(RoadCheckStatistics roadCheckStatistics); } 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 f3465d2..8af8ad8 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 @@ -18,7 +18,7 @@ public interface TbXjxdzhxxbMapper * @param Id 夏季行动综合信息ID * @return 夏季行动综合信息 */ - public TbXjxdzhxxb selectTbXjxdzhxxbById(Long Id); + public TbXjxdzhxxb selectTbXjxdzhxxbById(String Id); /** * 查询夏季行动综合信息列表 @@ -50,7 +50,7 @@ public interface TbXjxdzhxxbMapper * @param Id 夏季行动综合信息ID * @return 结果 */ - public int deleteTbXjxdzhxxbById(Long Id); + public int deleteTbXjxdzhxxbById(String Id); /** * 批量删除夏季行动综合信息 @@ -63,4 +63,8 @@ public interface TbXjxdzhxxbMapper public TbXjxdzhxxb selectCountBySj(TbXjxdzhxxb xjxdzhxxb); public TbXjxdzhxxb getMdjfTj(TbXjxdzhxxb xjxdzhxxb); + + public List xjxdStatics(TbXjxdzhxxb xjxdzhxxb); + + public int xjxdCount(TbXjxdzhxxb xjxdzhxxb); } diff --git a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/RoadCheckStatisticsMapper.xml b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/RoadCheckStatisticsMapper.xml index fe5a021..5fbf05d 100644 --- a/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/RoadCheckStatisticsMapper.xml +++ b/basepro-manager/basepro-manager-dao/src/main/resources/mybatis/mapper/RoadCheckStatisticsMapper.xml @@ -34,6 +34,23 @@ + + + select d.* from ( + SELECT x.*,id, GAJGDM, GAJGMC, date_format(#{zafkrqStr},'%y%m%d') ZAFKRQ, TRXFJLSL, TRXFCLSL, QFQZSL, ZAKDSL, JCCLSL, PCRYSL, XCZDBWSL, JCFXYHCSSL, + FXYHCS_CZWSL, FXYHCS_LGSL, FXYHCS_YLCSSL, PCAQYHSL, XCAQYHSL, SJZDWP_QZ, SJZDWP_ZD, SJZDWP_ZY, SJZDWP_LG, SJZDWP_YZBHXP, + SJZDWP_JDHXP, SJZDWP_GZDJ, PCMDJFSL, HJMDJFSL, HLJTJFSL, HJHLJTJFSL, LLJFSL, HJLLJFSL, JJJFSL, HJJJJFSL, YLJFSL, HJYLJFSL, + YXGAJCZSL, SLZHKDSL, ZAPCRYSL, ZAPCCLSL, ZHZTRYSL, QFSFRYSL, CHWP_GZDJ, + (CASE WHEN b.gajgdm is null THEN '未上报' + ELSE '已上报' + END) as sfdj + FROM sys_dept_xzqh x LEFT JOIN tb_xjxdzhxxb b on x.dept_id = b.gajgdm and ZAFKRQ = #{zafkrqStr} + where 1=1 + + 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') + + ORDER BY dept_id ) d left join sys_dept s on d.dept_id = s.dept_id + + d.is_open = '0' ${params.dataScope} + and XZQHDM = #{XZQHDM} + and XZQHMC = #{XZQHMC} + + and (d.dept_id = #{GAJGDM} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) )) + + and GAJGMC = #{GAJGMC} + + and TRXFJLSL = #{TRXFJLSL} + and TRXFCLSL = #{TRXFCLSL} + and QFQZSL = #{QFQZSL} + and ZAKDSL = #{ZAKDSL} + and JCCLSL = #{JCCLSL} + and PCRYSL = #{PCRYSL} + and XCZDBWSL = #{XCZDBWSL} + ORDER BY d.dept_id + + + + + - where id = #{Id} @@ -272,11 +369,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and jgdm = #{GAJGDM} - and tjsj = TO_DATE(#{ZAFKRQ}, 'yyyy-mm-dd') + and tjsj = TO_DATE(#{zafkrqStr}, 'yyyy-mm-dd') - + delete from tb_xjxdzhxxb where id = #{Id} 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 2fd3480..51fb866 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 @@ -20,7 +20,7 @@ public interface ITbXjxdzhxxbService * @param Id 夏季行动综合信息ID * @return 夏季行动综合信息 */ - public TbXjxdzhxxb selectTbXjxdzhxxbById(Long Id); + public TbXjxdzhxxb selectTbXjxdzhxxbById(String Id); /** * 查询夏季行动综合信息列表 @@ -30,6 +30,8 @@ public interface ITbXjxdzhxxbService */ public TableDataInfo selectTbXjxdzhxxbList(TbXjxdzhxxb tbXjxdzhxxb, Integer pageNum, Integer pageSize); + public TableDataInfo selectTbXjxdzhxxbListNoPage(TbXjxdzhxxb tbXjxdzhxxb); + public List selectXjxdzhxxbList(TbXjxdzhxxb tbXjxdzhxxb); /** @@ -60,17 +62,24 @@ public interface ITbXjxdzhxxbService */ public int deleteTbXjxdzhxxbByIds(String ids); + public int deleteTbXjxdzhxxbByIdsGs(String ids); + /** * 删除夏季行动综合信息信息 * * @param Id 夏季行动综合信息ID * @return 结果 */ - public int deleteTbXjxdzhxxbById(Long Id); + public int deleteTbXjxdzhxxbById(String Id); + + public int deleteTbXjxdzhxxbByIdGs(String Id); public TbXjxdzhxxb getNumByPctj(String manageDeptId, String date); public List xjxdStatics(TbXjxdzhxxb xjxdzhxxb); public SysDeptXzqh selectSysDeptXzqhById(String DeptId); + + public int xjxdCount(TbXjxdzhxxb xjxdzhxxb); + } diff --git a/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbXjxdzhxxb.java b/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbXjxdzhxxb.java index 8cd2012..ef57dd0 100644 --- a/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbXjxdzhxxb.java +++ b/basepro-manager/basepro-manager-pojo/src/main/java/basepro/manager/pojo/TbXjxdzhxxb.java @@ -31,13 +31,22 @@ public class TbXjxdzhxxb extends BaseEntity private String XZQHMC; /** 公安机关代码 */ - @Excel(name = "公安机关代码") + private String GAJGDM; + @Excel(name = "公安机关代码") + private String deptId; + /** 公安机关名称 */ - @Excel(name = "公安机关名称") + private String GAJGMC; + @Excel(name = "公安机关名称") + private String deptName; + + @Excel(name = "是否上报") + private String sfdj; + /** 登记日期 */ @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @@ -193,6 +202,8 @@ public class TbXjxdzhxxb extends BaseEntity @Excel(name = "查获管制刀具数量", readConverterExp = "把=") private Long ChwpGzdj; + + private List stuckList; public String getId() { @@ -598,6 +609,30 @@ public class TbXjxdzhxxb extends BaseEntity this.zafkrqStr = zafkrqStr; } + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getSfdj() { + return sfdj; + } + + public void setSfdj(String sfdj) { + this.sfdj = sfdj; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java index a85d076..af53922 100644 --- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java +++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbChryxxbServiceImpl.java @@ -91,8 +91,17 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService public int insertTbChryxxbGs(TbChryxxb tbChryxxb) { - DataSourceUtil.setDB("db2"); - return tbChryxxbMapper.insertTbChryxxb(tbChryxxb); + int num = 0; + try { + DataSourceUtil.setDB("db2"); + num = tbChryxxbMapper.insertTbChryxxb(tbChryxxb); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + + return num; } /** @@ -108,8 +117,16 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService } public int updateTbChryxxbGs(TbChryxxb tbChryxxb) { - DataSourceUtil.setDB("db2"); - return tbChryxxbMapper.updateTbChryxxb(tbChryxxb); + int num = 0; + try { + DataSourceUtil.setDB("db2"); + num = tbChryxxbMapper.updateTbChryxxb(tbChryxxb); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + return num; } /** diff --git a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java index 8e69067..811a94a 100644 --- a/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java +++ b/basepro-manager/basepro-manager-service/src/main/java/basepro/manager/service/impl/TbMdjfjxxxbServiceImpl.java @@ -1,5 +1,6 @@ package basepro.manager.service.impl; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -82,17 +83,21 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService } public int insertTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb) { - DataSourceUtil.setDB("db2"); + int num = 0; try { + DataSourceUtil.setDB("db2"); tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setDjsj(DateUtils.parseDate(tbMdjfjxxxb.getDjsjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setTcsj(DateUtils.parseDate(tbMdjfjxxxb.getTcsjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setJlgxsj(DateUtils.parseDate(tbMdjfjxxxb.getJlgxsjStr(),"yyyy-MM-dd HH:mm:ss")); + num = tbMdjfjxxxbMapper.insertTbMdjfjxxxb(tbMdjfjxxxb); }catch (Exception e){ e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); } - return tbMdjfjxxxbMapper.insertTbMdjfjxxxb(tbMdjfjxxxb); + return num; } @Override @@ -130,17 +135,21 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService } public int updateTbMdjfjxxxbGs(TbMdjfjxxxb tbMdjfjxxxb) { + int num = 0; try { DataSourceUtil.setDB("db2"); tbMdjfjxxxb.setFssj(DateUtils.parseDate(tbMdjfjxxxb.getFssjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setDjsj(DateUtils.parseDate(tbMdjfjxxxb.getDjsjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setTcsj(DateUtils.parseDate(tbMdjfjxxxb.getTcsjStr(),"yyyy-MM-dd HH:mm:ss")); tbMdjfjxxxb.setJlgxsj(DateUtils.parseDate(tbMdjfjxxxb.getJlgxsjStr(),"yyyy-MM-dd HH:mm:ss")); + num = tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb); }catch (Exception e){ e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); } - tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb); - return tbMdjfjxxxbMapper.updateTbMdjfjxxxb(tbMdjfjxxxb); + + return num; } /** @@ -174,7 +183,15 @@ public class TbMdjfjxxxbServiceImpl implements ITbMdjfjxxxbService @Override public List selectMdjfList(String jlgxsj) { - DataSourceUtil.setDB("db3"); - return tbMdjfjxxxbMapper.selectMdjfList(jlgxsj); + List list = new ArrayList<>(); + try { + DataSourceUtil.setDB("db3"); + list = tbMdjfjxxxbMapper.selectMdjfList(jlgxsj); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + return list; } } 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 678e212..5a14338 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 @@ -53,9 +53,11 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService * @return 夏季行动综合信息 */ @Override - public TbXjxdzhxxb selectTbXjxdzhxxbById(Long Id) + public TbXjxdzhxxb selectTbXjxdzhxxbById(String Id) { - return tbXjxdzhxxbMapper.selectTbXjxdzhxxbById(Id); + TbXjxdzhxxb xjxd = tbXjxdzhxxbMapper.selectTbXjxdzhxxbById(Id); + xjxd.setZafkrqStr(DateUtils.parseDateToStr("yyyy-MM-dd",xjxd.getZAFKRQ())); + return xjxd; } /** @@ -72,9 +74,15 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService return getDataTable(list); } + @Override + public TableDataInfo selectTbXjxdzhxxbListNoPage(TbXjxdzhxxb tbXjxdzhxxb) { + List list = tbXjxdzhxxbMapper.xjxdStatics(tbXjxdzhxxb); + return getDataTable(list); + } + @Override public List selectXjxdzhxxbList(TbXjxdzhxxb tbXjxdzhxxb) { - return tbXjxdzhxxbMapper.selectTbXjxdzhxxbList(tbXjxdzhxxb); + return tbXjxdzhxxbMapper.xjxdStatics(tbXjxdzhxxb); } /** @@ -93,17 +101,34 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService @Override // @DataSource(DataSourceEnum.DB2) public int insertTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb) { - DataSourceUtil.setDB("db2"); - tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr())); - return tbXjxdzhxxbMapper.insertTbXjxdzhxxb(tbXjxdzhxxb); + int num = 0; + try { + DataSourceUtil.setDB("db2"); + tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr())); + num = tbXjxdzhxxbMapper.insertTbXjxdzhxxb(tbXjxdzhxxb); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + + return num; } @Override // @DataSource(DataSourceEnum.DB2) public int updateTbXjxdzhxxbGs(TbXjxdzhxxb tbXjxdzhxxb) { - DataSourceUtil.setDB("db2"); - tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr())); - int num = tbXjxdzhxxbMapper.updateTbXjxdzhxxb(tbXjxdzhxxb); + int num = 0; + try { + DataSourceUtil.setDB("db2"); + tbXjxdzhxxb.setZAFKRQ(DateUtils.parseDate(tbXjxdzhxxb.getZafkrqStr())); + num = tbXjxdzhxxbMapper.updateTbXjxdzhxxb(tbXjxdzhxxb); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + return num; } @@ -133,6 +158,21 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService return tbXjxdzhxxbMapper.deleteTbXjxdzhxxbByIds(Convert.toStrArray(ids)); } + @Override + public int deleteTbXjxdzhxxbByIdsGs(String ids) { + int num = 0; + try { + DataSourceUtil.setDB("db2"); + num = tbXjxdzhxxbMapper.deleteTbXjxdzhxxbByIds(Convert.toStrArray(ids)); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + + return num; + } + /** * 删除夏季行动综合信息信息 * @@ -140,11 +180,26 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService * @return 结果 */ @Override - public int deleteTbXjxdzhxxbById(Long Id) + public int deleteTbXjxdzhxxbById(String Id) { return tbXjxdzhxxbMapper.deleteTbXjxdzhxxbById(Id); } + @Override + public int deleteTbXjxdzhxxbByIdGs(String Id) { + int num = 0; + try { + DataSourceUtil.setDB("db2"); + num = tbXjxdzhxxbMapper.deleteTbXjxdzhxxbById(Id); + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); + } + + return num; + } + @Override public TbXjxdzhxxb getNumByPctj(String manageDeptId ,String date) { TbXjxdzhxxb xjxd = new TbXjxdzhxxb(); @@ -154,15 +209,24 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService HashMap map = new HashMap(); map.put("beginTime",date); map.put("endTime",date); + xjxd.setZafkrqStr(date); RoadCheckStatistics statistics = new RoadCheckStatistics(); statistics.setDeptId(manageDeptId); statistics.setParams(map); //社会面统计 - RoadCheckStatistics shmstatics = checkStatisticsMapper.getRoadCheckStatistics(statistics); + RoadCheckStatistics shmstatics = checkStatisticsMapper.getRoadStatistics(statistics); if (null != shmstatics){ - xjxd.setZAKDSL(Long.valueOf(shmstatics.getUnusualPeopleCount())); xjxd.setJCCLSL(Long.valueOf(shmstatics.getAllCarCount())); xjxd.setPCRYSL(Long.valueOf(shmstatics.getAllPeopleCount())); + Long ztCount = 0L; + if (null != shmstatics.getPtype() && !"".equals(shmstatics.getPtype())){ + JSONObject object = JSONObject.parseObject(shmstatics.getPtype()); + Long zt = object.getLong("3"); + if (null != zt){ + ztCount = zt; + } + } + xjxd.setZAKDSL(ztCount); }else { xjxd.setZAKDSL(0L); xjxd.setJCCLSL(0L); @@ -170,20 +234,31 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService } //卡点统计 - RoadCheckStatistics kdstatics = checkStatisticsMapper.getCheckStatistics(statistics); - if (null != kdstatics){ - xjxd.setZAPCRYSL(Long.valueOf(kdstatics.getAllPeopleCount())); - xjxd.setZAPCCLSL(Long.valueOf(kdstatics.getAllCarCount())); - if (null != kdstatics.getPtype() && !"".equals(kdstatics.getPtype())){ - JSONObject object = JSONObject.parseObject(kdstatics.getPtype()); - Long zt = object.getLong("3"); - Long sf = object.getLong("7"); - xjxd.setZHZTRYSL(zt); - xjxd.setQFSFRYSL(sf); - }else { - xjxd.setZHZTRYSL(0L); - xjxd.setQFSFRYSL(0l); + List list = checkStatisticsMapper.getCheckStatistics(statistics); + if (null != list && list.size() != 0){ + Long pcount = 0L; + Long ccount = 0L; + Long ztcount = 0L; + Long sfcount = 0L; + for (RoadCheckStatistics kdstatics : list) { + pcount = pcount + Long.valueOf(kdstatics.getAllPeopleCount()); + ccount = ccount + Long.valueOf(kdstatics.getAllCarCount()); + if (null != kdstatics.getPtype() && !"".equals(kdstatics.getPtype())){ + JSONObject object = JSONObject.parseObject(kdstatics.getPtype()); + Long zt = object.getLong("3"); + Long sf = object.getLong("7"); + if (null != zt){ + ztcount = ztcount + zt; + } + if (null != sf){ + sfcount = sfcount +sf; + } + } } + xjxd.setZAPCRYSL(pcount); + xjxd.setZAPCCLSL(ccount); + xjxd.setZHZTRYSL(ztcount); + xjxd.setQFSFRYSL(sfcount); }else { xjxd.setZAPCRYSL(0L); xjxd.setZAPCCLSL(0L); @@ -209,34 +284,41 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService xjxd.setXZQHDM(xzqh.getXzqhdm()); xjxd.setXZQHMC(xzqh.getXzqhmc()); } - TbXjxdzhxxb mdjfpara = new TbXjxdzhxxb(); - mdjfpara.setGAJGDM(manageDeptId); - mdjfpara.setZAFKRQ(DateUtils.parseDate(date)); - DataSourceUtil.setDB("db3"); - TbXjxdzhxxb mdjf = tbXjxdzhxxbMapper.getMdjfTj(mdjfpara); - if (null != mdjf){ - xjxd.setPCMDJFSL(mdjf.getPCMDJFSL()); - xjxd.setHJMDJFSL(mdjf.getHJMDJFSL()); - xjxd.setHLJTJFSL(mdjf.getHLJTJFSL()); - xjxd.setHJHLJTJFSL(mdjf.getHJHLJTJFSL()); - xjxd.setLLJFSL(mdjf.getLLJFSL()); - xjxd.setHJLLJFSL(mdjf.getHJLLJFSL()); - xjxd.setJJJFSL(mdjf.getJJJFSL()); - xjxd.setHJJJJFSL(mdjf.getHJJJJFSL()); - xjxd.setYLJFSL(mdjf.getYLJFSL()); - xjxd.setHJYLJFSL(mdjf.getHJYLJFSL()); - }else { - xjxd.setPCMDJFSL(0L); - xjxd.setHJMDJFSL(0L); - xjxd.setHLJTJFSL(0L); - xjxd.setHJHLJTJFSL(0L); - xjxd.setLLJFSL(0L); - xjxd.setHJLLJFSL(0L); - xjxd.setJJJFSL(0L); - xjxd.setHJJJJFSL(0L); - xjxd.setYLJFSL(0L); - xjxd.setHJYLJFSL(0L); + try { + TbXjxdzhxxb mdjfpara = new TbXjxdzhxxb(); + mdjfpara.setGAJGDM(manageDeptId); + mdjfpara.setZafkrqStr(date); + DataSourceUtil.setDB("db3"); + TbXjxdzhxxb mdjf = tbXjxdzhxxbMapper.getMdjfTj(mdjfpara); + if (null != mdjf){ + xjxd.setPCMDJFSL(mdjf.getPCMDJFSL()); + xjxd.setHJMDJFSL(mdjf.getHJMDJFSL()); + xjxd.setHLJTJFSL(mdjf.getHLJTJFSL()); + xjxd.setHJHLJTJFSL(mdjf.getHJHLJTJFSL()); + xjxd.setLLJFSL(mdjf.getLLJFSL()); + xjxd.setHJLLJFSL(mdjf.getHJLLJFSL()); + xjxd.setJJJFSL(mdjf.getJJJFSL()); + xjxd.setHJJJJFSL(mdjf.getHJJJJFSL()); + xjxd.setYLJFSL(mdjf.getYLJFSL()); + xjxd.setHJYLJFSL(mdjf.getHJYLJFSL()); + }else { + xjxd.setPCMDJFSL(0L); + xjxd.setHJMDJFSL(0L); + xjxd.setHLJTJFSL(0L); + xjxd.setHJHLJTJFSL(0L); + xjxd.setLLJFSL(0L); + xjxd.setHJLLJFSL(0L); + xjxd.setJJJFSL(0L); + xjxd.setHJJJJFSL(0L); + xjxd.setYLJFSL(0L); + xjxd.setHJYLJFSL(0L); + } + }catch (Exception e){ + e.printStackTrace(); + }finally { + DataSourceUtil.clearDB(); } + return xjxd; } @@ -260,4 +342,9 @@ public class TbXjxdzhxxbServiceImpl implements ITbXjxdzhxxbService public SysDeptXzqh selectSysDeptXzqhById(String DeptId) { return xzqhMapper.selectSysDeptXzqhById(DeptId); } + + @Override + public int xjxdCount(TbXjxdzhxxb xjxdzhxxb) { + return tbXjxdzhxxbMapper.xjxdCount(xjxdzhxxb); + } } 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 fe808d4..31a1b73 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 @@ -69,7 +69,7 @@ public class TbMdjfjxxxbController extends BaseController /** * 导出矛盾纠纷简项信息列表 */ - @RequiresPermissions("system:mdjfjxxxb:export") +// @RequiresPermissions("system:mdjfjxxxb:export") @PostMapping("/export") @ResponseBody public AjaxResult export(TbMdjfjxxxb tbMdjfjxxxb) @@ -139,7 +139,7 @@ public class TbMdjfjxxxbController extends BaseController return toAjax(tbMdjfjxxxbService.deleteTbMdjfjxxxbByIds(ids)); } - @Scheduled(cron = "4 11/5 * ? * *") +// @Scheduled(cron = "0 0/4 * * * ?") public void mdjfDataScheduled(){ Date exDate = tbMdjfjxxxbService.selectMaxJlsj(); List mdjfjxxxbList = tbMdjfjxxxbService.selectMdjfList(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",exDate)); 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 ed3d3d2..ce14e76 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 @@ -17,6 +17,7 @@ import guo.ping.e3mall.common.page.PageDomain; import guo.ping.e3mall.common.page.TableDataInfo; import guo.ping.e3mall.common.page.TableSupport; import guo.ping.e3mall.common.pojo.AjaxResult; +import guo.ping.e3mall.common.utils.DateUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -59,29 +60,30 @@ public class TbXjxdzhxxbController extends BaseController @ResponseBody public TableDataInfo list(TbXjxdzhxxb tbXjxdzhxxb) { - startPage(); - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); +// startPage(); +// PageDomain pageDomain = TableSupport.buildPageRequest(); +// tbXjxdzhxxb.setZafkrqStr(DateUtils.parseDateToStr("yyyy-mm-dd",tbXjxdzhxxb.getZAFKRQ())); +// 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); + TableDataInfo info = tbXjxdzhxxbService.selectTbXjxdzhxxbListNoPage(tbXjxdzhxxb); return info; } /** * 导出夏季行动综合信息列表 */ - @RequiresPermissions("system:xjxdzhxxb:export") +// @RequiresPermissions("system:xjxdzhxxb:export") @PostMapping("/export") @ResponseBody public AjaxResult export(TbXjxdzhxxb tbXjxdzhxxb) { List list = tbXjxdzhxxbService.selectXjxdzhxxbList(tbXjxdzhxxb); ExcelUtil util = new ExcelUtil(TbXjxdzhxxb.class); - return util.exportExcel(list, "xjxdzhxxb"); + return util.exportExcel(list, "数据上报"); } /** @@ -119,11 +121,21 @@ public class TbXjxdzhxxbController extends BaseController return AjaxResult.success(xjxd); } + @PostMapping("/getCountByDate") + @ResponseBody + public AjaxResult getCountByDate(String date,String zzjgdm){ + TbXjxdzhxxb xjxdzhxxb = new TbXjxdzhxxb(); + xjxdzhxxb.setZafkrqStr(date); + xjxdzhxxb.setGAJGDM(zzjgdm); + int num = tbXjxdzhxxbService.xjxdCount(xjxdzhxxb); + return AjaxResult.success(num); + } + /** * 修改夏季行动综合信息 */ @GetMapping("/edit/{Id}") - public String edit(@PathVariable("Id") Long Id, ModelMap mmap) + public String edit(@PathVariable("Id") String Id, ModelMap mmap) { TbXjxdzhxxb tbXjxdzhxxb = tbXjxdzhxxbService.selectTbXjxdzhxxbById(Id); mmap.put("tbXjxdzhxxb", tbXjxdzhxxb); @@ -139,6 +151,7 @@ public class TbXjxdzhxxbController extends BaseController @ResponseBody public AjaxResult editSave(TbXjxdzhxxb tbXjxdzhxxb) { + tbXjxdzhxxbService.updateTbXjxdzhxxbGs(tbXjxdzhxxb); return toAjax(tbXjxdzhxxbService.updateTbXjxdzhxxb(tbXjxdzhxxb)); } @@ -151,6 +164,7 @@ public class TbXjxdzhxxbController extends BaseController @ResponseBody public AjaxResult remove(String ids) { + tbXjxdzhxxbService.deleteTbXjxdzhxxbByIdGs(ids); return toAjax(tbXjxdzhxxbService.deleteTbXjxdzhxxbByIds(ids)); } } diff --git a/basepro-manager/basepro-manager-web/src/main/resources/static/basepro/js/common.js b/basepro-manager/basepro-manager-web/src/main/resources/static/basepro/js/common.js index 2a65f32..efad501 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/static/basepro/js/common.js +++ b/basepro-manager/basepro-manager-web/src/main/resources/static/basepro/js/common.js @@ -54,6 +54,24 @@ $(function() { } } }); + var nowDate = laydate.render({ + elem: '#nowTime', + theme: 'molv', + trigger: 'click', + // value: new Date(), + done: function(value, date) { + // 结束时间大于开始时间 + if (value !== '') { + endDate.config.min.year = date.year; + endDate.config.min.month = date.month - 1; + endDate.config.min.date = date.date; + } else { + endDate.config.min.year = ''; + endDate.config.min.month = ''; + endDate.config.min.date = ''; + } + } + }); var endDate = laydate.render({ elem: '#endTime', min: $('#startTime').val(), diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html index 8af319b..d42bb83 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/chry/chryxxb.html @@ -105,6 +105,8 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + sortName: "jcsj", + sortOrder: "desc", modalName: "检查站查获人员信息", columns: [{ checkbox: true @@ -160,7 +162,7 @@ field : 'jcsjStr', title : '检查时间' }, - { + /*{ title: '操作', align: 'center', formatter: function(value, row, index) { @@ -169,7 +171,7 @@ actions.push('删除'); return actions.join(''); } - }] + }*/] }; $.table.init(options); }); 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 c3afc6b..2d9ced8 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 @@ -100,6 +100,8 @@ removeUrl: prefix + "/remove", exportUrl: prefix + "/export", modalName: "矛盾纠纷简项信息", + sortName: "djsj", + sortOrder: "desc", columns: [{ checkbox: true }, @@ -108,10 +110,10 @@ title : '矛盾纠纷编号', visible: false }, - { + /*{ field : 'fssj', title : '纠纷发生时间' - }, + },*/ /*{ field : 'xzqhdm', title : '矛盾纠纷地行政区划代码' @@ -192,7 +194,7 @@ field : 'jlgxsj', title : '记录更新时间' },*/ - { + /*{ title: '操作', align: 'center', formatter: function(value, row, index) { @@ -201,7 +203,7 @@ actions.push('删除'); return actions.join(''); } - }] + }*/] }; $.table.init(options); }); diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html index b10afae..e87f22f 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/add.html @@ -13,7 +13,7 @@
- +
@@ -21,7 +21,7 @@
- +
@@ -31,7 +31,7 @@
- +
@@ -39,7 +39,7 @@
- +
@@ -49,7 +49,7 @@
- +
@@ -63,7 +63,7 @@
- +
@@ -72,7 +72,7 @@
- +
@@ -82,7 +82,7 @@
- +
@@ -90,7 +90,7 @@
- +
@@ -100,7 +100,7 @@
- +
@@ -108,7 +108,7 @@
- +
@@ -118,7 +118,7 @@
- +
@@ -126,14 +126,14 @@ -
注*数据来源为人车物平台路面盘查数据,可根据实际情况进行修改
-

社会面防控总体情况

+
注*数据来源为社会面人车物核验数据,请根据实际情况进行修改
+

安全隐患排查整治

- +
@@ -141,7 +141,7 @@
- +
@@ -151,7 +151,7 @@
- +
@@ -159,7 +159,7 @@
- +
@@ -169,7 +169,7 @@
- +
@@ -177,7 +177,7 @@
- +
@@ -188,7 +188,7 @@
- +
@@ -196,7 +196,7 @@
- +
@@ -206,7 +206,7 @@
- +
@@ -214,7 +214,7 @@
- +
@@ -224,7 +224,7 @@
- +
@@ -232,7 +232,7 @@
- +
@@ -242,7 +242,7 @@
- +
@@ -256,7 +256,7 @@
- +
@@ -264,7 +264,7 @@
- +
@@ -274,7 +274,7 @@
- +
@@ -282,7 +282,7 @@
- +
@@ -292,7 +292,7 @@
- +
@@ -300,7 +300,7 @@
- +
@@ -310,7 +310,7 @@
- +
@@ -318,7 +318,7 @@
- +
@@ -328,7 +328,7 @@
- +
@@ -336,19 +336,19 @@
- +
-
注*数据来源为瑞信矛盾纠纷平台数据,可根据实际情况进行修改
+
注*数据来源为治安总队矛盾纠纷数据,请根据实际情况进行修改

检查站查控

- +
@@ -356,7 +356,7 @@
- +
@@ -366,7 +366,7 @@
- +
@@ -374,7 +374,7 @@
- +
@@ -384,7 +384,7 @@
- +
@@ -392,7 +392,7 @@
- +
@@ -402,7 +402,7 @@
- +
@@ -410,7 +410,7 @@ -
注*数据来源为人车物平台卡点盘查数据,可根据实际情况进行修改
+
注*数据来源为社会面人车物核验数据,请根据实际情况进行修改
@@ -421,16 +421,36 @@ focusCleanup: true }); + var today = new Date(); + function submitHandler() { - if ($.validate.form()) { - $.operate.save(prefix + "/add", $('#form-xjxdzhxxb-add').serialize()); - } + var starttime=$('#zafkrqStr').val(); + $.ajax({ + url: prefix + '/getCountByDate', + type: 'POST', + data: {date: starttime,zzjgdm:$("#zzjgdm").val()}, + success: function (res) { + var data = res.data; + debugger; + if (data > 0){ + $.modal.alertWarning("本单位已上报当日数据,无需重复上报！"); + return; + }else { + if ($.validate.form()) { + $.operate.save(prefix + "/add", $('#form-xjxdzhxxb-add').serialize()); + } + } + } + }) + } - $("input[name='zafkrqStr']").datetimepicker({ + /*$("input[name='zafkrqStr']").datetimepicker({ format: "yyyy-mm-dd", minView: 2, - autoclose: true + autoclose: true, + initialDate:new Date(), + endDate: today, }).on('changeDate',function(){ var starttime=$('#zafkrqStr').val(); $.ajax({ @@ -442,7 +462,7 @@ $(':input[name="ZAKDSL"]').val(data.zakdsl); $(':input[name="JCCLSL"]').val(data.jcclsl); $(':input[name="PCRYSL"]').val(data.pcrysl); - /* $(':input[name="PCMDJFSL"]').val(data.pcmdjfsl); + $(':input[name="PCMDJFSL"]').val(data.pcmdjfsl); $(':input[name="HJMDJFSL"]').val(data.hjmdjfsl); $(':input[name="HLJTJFSL"]').val(data.hljtjfsl); $(':input[name="HJHLJTJFSL"]').val(data.hjhljtjfsl); @@ -451,7 +471,7 @@ $(':input[name="JJJFSL"]').val(data.jjjfsl); $(':input[name="HJJJJFSL"]').val(data.hjjjjfsl); $(':input[name="YLJFSL"]').val(data.yljfsl); - $(':input[name="HJYLJFSL"]').val(data.hjyljfsl);*/ + $(':input[name="HJYLJFSL"]').val(data.hjyljfsl); $(':input[name="YXGAJCZSL"]').val(data.yxgajczsl); $(':input[name="SLZHKDSL"]').val(data.slzhkdsl); $(':input[name="ZAPCRYSL"]').val(data.zapcrysl); @@ -464,6 +484,7 @@ } }) }); +*/ \ No newline at end of file diff --git a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html index 402f9bc..f634583 100644 --- a/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html +++ b/basepro-manager/basepro-manager-web/src/main/resources/templates/xjxd/edit.html @@ -14,7 +14,7 @@
- +
@@ -22,7 +22,7 @@
- +
@@ -32,7 +32,7 @@
- +
@@ -40,26 +40,7 @@
- -
-
- - -

社会面防控总体情况

-
-
-
- -
- -
-
-
-
-
- -
- +
@@ -67,45 +48,9 @@
- +
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- +
@@ -114,12 +59,80 @@

社会面防控总体情况

+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+

安全隐患排查整治

- +
@@ -127,7 +140,7 @@
- +
@@ -137,7 +150,7 @@
- +
@@ -145,7 +158,7 @@
- +
@@ -155,7 +168,7 @@
- +
@@ -163,7 +176,7 @@
- +
@@ -174,7 +187,7 @@
- +
@@ -182,7 +195,7 @@
- +
@@ -192,7 +205,7 @@
- +
@@ -200,7 +213,7 @@
- +
@@ -210,7 +223,7 @@
- +
@@ -218,7 +231,7 @@
- +
@@ -228,7 +241,7 @@
- +
@@ -242,7 +255,7 @@
- +
@@ -250,7 +263,7 @@
- +
@@ -260,7 +273,7 @@
- +
@@ -268,7 +281,7 @@
- +
@@ -278,7 +291,7 @@
- +
@@ -286,7 +299,7 @@
- +
@@ -296,7 +309,7 @@
- +
@@ -304,7 +317,7 @@
- +
@@ -314,7 +327,7 @@
- +
@@ -322,7 +335,7 @@
- +
@@ -333,7 +346,7 @@
- +
@@ -341,7 +354,7 @@
- +
@@ -351,7 +364,7 @@
- +
@@ -359,7 +372,7 @@
- +
@@ -369,7 +382,7 @@
- +
@@ -377,7 +390,7 @@
- +
@@ -387,7 +400,7 @@
- +
@@ -413,11 +426,11 @@ } } - $("input[name='ZAFKRQ']").datetimepicker({ + /*$("input[name='ZAFKRQ']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true - }); + });*/ \ No newline at end of file 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 c8ae4c7..7f1b654 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 @@ -1,9 +1,17 @@ - + + + +
@@ -13,19 +21,17 @@
    -
  • +
  • - +
  • - - - - +
  • @@ -44,12 +50,12 @@ - + + 导出 - --> +
@@ -62,6 +68,39 @@ var editFlag = [[${@permission.hasPermi('system:xjxdzhxxb:edit')}]]; var removeFlag = [[${@permission.hasPermi('system:xjxdzhxxb:remove')}]]; var prefix = ctx + "system/xjxdzhxxb"; + $("#nowTime").val(getdate()); + + function getdate(){ + var currentTime = new Date(); + var year = currentTime.getFullYear(); + var month = currentTime.getMonth() + 1; + var day = currentTime.getDate(); + if(month < 10){ + month = "0"+month; + } + if (day < 10){ + day = "0"+day; + } + var formattedTime = year + "-" + month + "-" + day; + return formattedTime; + } + + function yesterday (){ + var today = new Date(); + var yesterday = new Date(today); + yesterday.setDate(today.getDate() - 1); + var yy = yesterday.getFullYear(); + var mm = yesterday.getMonth() + 1; + var dd = yesterday.getDate(); + if(mm < 10){ + mm = "0"+mm; + } + if (dd < 10){ + dd = "0"+dd; + } + var formattedTime = yy + "-" + mm + "-" + dd; + return formattedTime; + } $(function() { var options = { @@ -70,9 +109,10 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "夏季行动综合信息", + modalName: "数据上报", + pagination: false, columns: [{ - checkbox: true + checkbox: false }, { field : 'Id', @@ -92,12 +132,24 @@ title : '公安机关代码' },*/ { - field : 'gajgmc', + field : 'deptName', title : '公安机关名称', }, + { + field : 'sfdj', + title : '是否上报', + formatter: function(value, row, index) { + if (value == '未上报'){ + return ''+value+' ' + }else { + return ''+value+' ' + } + } + }, { field : 'ZAFKRQ', title : '登记日期', + class: 'table-cell-nowrap' }, { field : 'trxfjlsl', @@ -250,10 +302,12 @@ { title: '操作', align: 'center', - width:'20%', + class: 'table-cell-nowrap', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); + if ((row.sfdj == '已上报' && row.ZAFKRQ == getdate())){ + actions.push('编辑 '); + } actions.push('删除'); return actions.join(''); } @@ -262,6 +316,13 @@ $.table.init(options); }); + + function isCurrentTimeAfterNoon() { + var now = new Date(); + var hours = now.getHours(); + return hours < 10; + } + function reset() { $("#treeId").val(""); $.form.reset() @@ -270,7 +331,7 @@ function selectDeptTree() { var treeId = $("#treeId").val(); var deptId = $.common.isEmpty(treeId) ? "340000000000" : treeId; - var type = 1; + var type = 4; var url = ctx + "system/dept/selectDeptTree/" + deptId+"/"+type; var options = { title: '选择机构',