From 515fae99e8d001dc17b384443903eb4e8ea691f1 Mon Sep 17 00:00:00 2001 From: yanyan Date: Fri, 11 Jul 2025 16:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E6=A3=80=E6=9F=A5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/user/service/UserServiceImpl.java | 1 + .../EnforcementRegistrationController.java | 71 +++++++++++-------- .../EnforcementRegistrationServiceImpl.java | 4 +- .../mapper/EnforcementRegistrationMapper.xml | 13 ++-- 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index 900f7be3..c4c953fe 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -286,6 +286,7 @@ public class UserServiceImpl implements IUserService { // user.setCreateBy(ShiroUtils.getLoginName()); //新增用户默认不删除标记 user.setDelFlag("0"); + user.setUserSource(0); // 新增用户信息 int rows = userMapper.insertUser(user); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 7fc25e76..15d14dee 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -90,7 +90,8 @@ public class EnforcementRegistrationController extends BaseController LocalDate endTime = localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); enforcementRegistration.setBeginTime(str.format(beginTime)); enforcementRegistration.setEndTime(str.format(endTime)); - List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); +// List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); + List list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); List uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList()); List checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList()); String checkName=iDictDataService.selectDictLabel("check_category","01"); @@ -138,28 +139,36 @@ public class EnforcementRegistrationController extends BaseController @ResponseBody public TableDataInfo list(EnforcementRegistration enforcementRegistration) { + List returnList = new ArrayList<>(); + returnList = getEnforcementRegistrations(enforcementRegistration); + return getDataTable(returnList); + } + + private List getEnforcementRegistrations(EnforcementRegistration enforcementRegistration) { + List returnList; if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){ if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){ - String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy()); - String jd=iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd()); + String qy=iDictDataService.selectDictLabel("address_Type", enforcementRegistration.getQy()); + String jd=iDictDataService.selectDictLabel(enforcementRegistration.getQy(), enforcementRegistration.getJd()); enforcementRegistration.setJd(jd); enforcementRegistration.setQy(qy); List list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); //注释为过滤开发环境无预约工单情况，正式环境可开启，此代码用于执法记录列表中对联合执法的记录标注牵头单位以及联合单位 - list=enforcementRegistrationService.untieCheck1Make(list); + list=enforcementRegistrationService.untieCheck1Make(list); for(int i=0;i enforcementRegistrationList=new ArrayList<>(); - String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy()); + String qy=iDictDataService.selectDictLabel("address_Type", enforcementRegistration.getQy()); List jdList=iDictDataService.selectDictDataByType(enforcementRegistration.getQy()); enforcementRegistration.setQy(qy); List list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); - //注释为过滤开发环境无预约工单情况，正式环境可开启，此代码用于执法记录列表中对联合执法的记录标注牵头单位以及联合单位 - list=enforcementRegistrationService.untieCheck1Make(list); + //注释为过滤开发环境无预约工单情况，正式环境可开启，此代码用于执法记录列表中对联合执法的记录标注牵头单位以及联合单位 + list=enforcementRegistrationService.untieCheck1Make(list); /*List jdStrings=new ArrayList<>(); for(DictData dictData:jdList){ jdStrings.add(dictData.getDictLabel()); @@ -181,7 +190,8 @@ public class EnforcementRegistrationController extends BaseController } enforcementRegistrationList.addAll(qtjdList); } - return getDataTable(enforcementRegistrationList); + returnList = enforcementRegistrationList; + //return getDataTable(enforcementRegistrationList); } }else { List qyList=iDictDataService.selectDictDataByType("address_Type"); @@ -225,9 +235,12 @@ public class EnforcementRegistrationController extends BaseController if(qtqyList.size()>0){ enforcementRegistrationsList.addAll(qtqyList); } - return getDataTable(enforcementRegistrationsList); + returnList = enforcementRegistrationsList; + //return getDataTable(enforcementRegistrationsList); } + return returnList; } + public Boolean qyMake(List strings,String s){ for (String string : strings) { if (s.startsWith("深圳市" + string.substring(0, string.indexOf("区")) + "区")||s.startsWith("深圳市" + string.substring(0, string.indexOf("区")) + "新区")) { @@ -291,24 +304,22 @@ public class EnforcementRegistrationController extends BaseController @GetMapping("/searchType") public String searchType(EnforcementRegistration enforcementRegistration,Model model) { - EnforcementRegistration eTotal=new EnforcementRegistration(); - eTotal.setYear(enforcementRegistration.getYear()); - List totalList=enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(eTotal); - model.addAttribute("total",totalList.size()); - if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){ - if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){ - enforcementRegistration.setJd(iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd())); - } - enforcementRegistration.setQy(iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy())); - } - DecimalFormat str1=new DecimalFormat("0.00%"); -// if(enforcementRegistration.getYear()==null||"".equals(enforcementRegistration.getYear())) { -// model.addAttribute("year","-"); -// }else { -// model.addAttribute("year", enforcementRegistration.getYear()); +// EnforcementRegistration eTotal=new EnforcementRegistration(); +// eTotal.setYear(enforcementRegistration.getYear()); +// List totalList=enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(eTotal); +// model.addAttribute("total",totalList.size()); +// if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){ +// if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){ +// enforcementRegistration.setJd(iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd())); +// } +// enforcementRegistration.setQy(iDictDataService.selectDictLabel("address_Type",enforcementRegistration.getQy())); // } - List list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); - System.out.println(1); + List list = getEnforcementRegistrations(enforcementRegistration); + model.addAttribute("total",list.size()); + DecimalFormat str1=new DecimalFormat("0.00%"); + + //List list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); + List uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList()); List checkList=new ArrayList<>(); String checkName; @@ -394,9 +405,9 @@ public class EnforcementRegistrationController extends BaseController public List echarts1(EnforcementRegistration enforcementRegistration){ List statisticsIndicatorList=new ArrayList<>(); Map dictDataMap=iDictDataService.selectDictDataByType("check_category").stream().collect(Collectors.toMap(DictData::getDictValue,Function.identity())); -// List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); - List list = - enforcementRegistrationService.selectEnforcementRegistrationList2(enforcementRegistration); + List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); +// List list = +// enforcementRegistrationService.selectEnforcementRegistrationList2(enforcementRegistration); Map checkMap=list.stream().collect(Collectors.groupingBy(item->item.getCheckCategory()==null||"".equals(item.getCheckCategory())?"空":item.getCheckCategory(),Collectors.counting())); for(String s:checkMap.keySet()){ StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index e311006c..50bd5502 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -215,7 +215,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } @Override - @DataScope + @DataScope(deptField = "bureau_dept_id") public List selectEnforcementRegistrationList2(EnforcementRegistration enforcementRegistration) { List enforcementRegistrations = @@ -233,7 +233,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } @Override - @DataScope + @DataScope(deptField = "bureau_dept_id") public List selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration) { DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 15c8cf8a..a4c80e38 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -469,15 +469,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND DATE_FORMAT(enforcement_time, '%m') = #{month} - - - and dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} or find_in_set( #{deptId} , ancestors ) ]]> 0 ) - - - - ${params.dataScope} - - + + + ${params.dataScope} + order by create_time desc