From c2247b50b14c7d2a942ff5ea946e9bc523f1efea Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Wed, 4 Feb 2026 16:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E7=BB=9F=E4=B8=80=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zdxt/common/util/IdCardCryptoUtil.java | 28 ++++++++--- .../zdxt/common/util/jasypt/JasyptUtils.java | 2 +- .../auth/framework/config/CorsFilter.java | 2 +- .../user/controller/IndexController.java | 6 ++- .../code/registration/registration.html | 50 ++++++++++++++++++- .../code/statistical-new/district-direct.html | 6 ++- .../project/code/statistical/home.html | 2 +- .../EnforcementRegistrationController.java | 11 +++- .../StatisticalPanelCityController.java | 32 +++++++++++- .../StatisticalPanelController.java | 5 +- .../StatisticalPanelDistrictController.java | 31 +++++++++++- .../com/zdxt/code/domain/MssqOrderFlow.java | 16 +++--- .../impl/EnterpriseComplaintServiceImpl.java | 4 +- .../EnterpriseLawEnforcementServiceImpl.java | 4 +- ...NonEnforcementRegistrationServiceImpl.java | 2 +- .../mapper/EnforcementRegistrationMapper.xml | 2 +- .../NonEnforcementRegistrationMapper.xml | 10 ++-- 17 files changed, 176 insertions(+), 37 deletions(-) diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java index 21006988..59a89bce 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java +++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java @@ -32,11 +32,11 @@ public class IdCardCryptoUtil { String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0"; System.out.println("====================== 示例 ======================"); // 加密 - String source_dec = "13101318327"; + String source_dec = "13009650312"; String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec); System.out.println(source_dec+" 加密后 : "+enc); // 解密 - String source_enc = "KjNrK9YlP6YWWRnURn9soA=="; + String source_enc = "SNe91sgGKxtErs+UX/lE7w=="; String dec = IdCardCryptoUtil.symmetricDecryptIdCard(key, source_enc); System.out.println(source_enc+" 解密后 : "+dec); @@ -51,10 +51,26 @@ public class IdCardCryptoUtil { System.out.println("====================== 实用 ======================"); String[] strings={ - "18566790558", - "18025361768", - "18575555197", + "13590339121", + "13631661625", + "13322980102", + "13632592442", + "13430419797", + "18124650573", + "13533812128", + "13316822721", + "13826520393", + "18681486898", + "18128825544", + "18126333814", }; + +// 刘义 13410900924 19020722074 +// 杜海荣 15019258592 19020722059 +// 张志兴 13760735454 19020722087 +// 陈翠莉 13192669039 19020722072 +// 李大航 17799857610 19020722079 + // String string=""; for(String s:strings){ String phoneJM=IdCardCryptoUtil.symmetricEncryptIdCard(key, s); @@ -155,5 +171,3 @@ public class IdCardCryptoUtil { return data; } } - - diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java index fce9f3a0..34ba04fa 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java +++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/jasypt/JasyptUtils.java @@ -52,7 +52,7 @@ public final class JasyptUtils { //加密 String s = encryptWithMD5("szsf@zfjd", "ATPfOhpnAVp6yBas7RU"); System.out.println(s); - String channelcs1 = decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==", "ATPfOhpnAVp6yBas7RU"); + String channelcs1 = decryptWithMD5("2fR5TkUb/A0p4+Gp/As+LJsVCjq7pgNwJIG2OAk2yWLXY/q7DNaCDQ==", "ATPfOhpnAVp6yBas7RU"); System.out.println(channelcs1); } } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java index f3548915..57b0ccc3 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CorsFilter.java @@ -32,7 +32,7 @@ public class CorsFilter implements Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { //配置可信域名 String[] authhosts = {"http://10.132.108.3:85","http://jdm.szssfj.cn","http://localhost:85","http://192.168.31.196:3301", - "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301"}; + "http://localhost:3301","http://10.132.108.3:81","http://10.132.108.3:85", "http://192.168.1.130:3301", "http://192.168.110.139:3301"}; String authost = ""; HttpServletRequest httprequest = (HttpServletRequest) request; String origin = httprequest.getHeader("Origin"); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/IndexController.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/IndexController.java index f07c0364..a42d88bb 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/IndexController.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/IndexController.java @@ -58,7 +58,11 @@ public class IndexController extends BaseController List systemCodeDtoList = menuService.getSystemCodeByUser(); mmap.put("menus", menus); mmap.put("user", user); - mmap.put("bureauDeptName", deptBean.getDeptName()); + if (null != deptBean) { + mmap.put("bureauDeptName", deptBean.getDeptName()); + } else { + mmap.put("bureauDeptName", ""); + } mmap.put("systemCode",systemCodeDtoList); mmap.put("copyrightYear", ruoYiConfig.getCopyrightYear()); mmap.put("demoEnabled", ruoYiConfig.isDemoEnabled()); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html index 2d4f3bb5..7fab2696 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -180,7 +180,7 @@ -->

  • ：

    -

    +

    • @@ -196,6 +196,10 @@ ×
    +
    + × +
    +
    @@ -414,7 +418,8 @@ formatter:function (value,row,index) { if(value == 1){ /*return "是";*/ - return ''+'是'+''; + return '是'; + // return ''+'是'+''; }else{ return "否"; } @@ -496,7 +501,45 @@ }; console.log(options); $("#bootstrap-table").bootstrapTable(options); + + var unionOptions={ + modalName: "联合执法", + pagination: true, + columns: [ + { + field : 'id', + title : '主键ID', + visible: false + }, + { + field : 'bureauDeptName', + title : '执法单位', + }, + { + field : 'enterpriseName', + title : '被执法企业名称', + }, + { + field : 'enforcementTime', + title : '执法时间' + } + ] + } + $("#bootstrap-table4").bootstrapTable(unionOptions); }); + + function unionList(union){ + $.ajax({ + url:prefix+'/unionList', + type:'post', + data:{unionNo: union}, + success: function (res) { + $('#detail3').show(); + $('#bootstrap-table4').bootstrapTable('load', res); + } + }) + } + $(function() { var options = { modalName: "执法记录统计-联合执法", @@ -1396,6 +1439,9 @@ function closeUnite(){ $('#detail2').hide(); } + function close4(){ + $('#detail3').hide(); + } function downloadR(){ var currentId=$('form').eq(0).attr('id'); var params = $.common.formToJSON(currentId); diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html index 42933d9d..ee3b357e 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html @@ -43,7 +43,11 @@ 综合数据 -
    各市直执法部门综合分析 各区执法综合分析
    +
    + 各市直执法部门综合分析 + 市直执法部门综合分析 + +
    单独执法数量
    diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html index 8423fee2..453d1176 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html @@ -682,7 +682,7 @@ $("#s_njc_num").text("-"); } else if (1 == result.data.roleFlag) { $("#leftFlag").text("各市值执法单位综合分析") - $("#rightFlag").text("各区直综合分析") + $("#rightFlag").text("各区综合分析") } non_jc_all = result.data.nonNum; 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 486f922d..ccbca30c 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 @@ -92,13 +92,14 @@ public class EnforcementRegistrationController extends BaseController enforcementRegistration.setEndTime(str.format(endTime)); // 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 uniteList=list.stream().filter(item->item.getHasUnion()==1).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"); // model.addAttribute("year",localDate.getYear()); model.addAttribute("yearList",yearMake()); model.addAttribute("total",list.size()); model.addAttribute("unite",uniteList.size()); + model.addAttribute("unite_per", (uniteList.size() * 100 + list.size() / 2) / list.size() + "%"); /*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/ if(uniteList.size()>0){ model.addAttribute("uniteDouble",str1.format((double)uniteList.size()/list.size())); @@ -143,6 +144,14 @@ public class EnforcementRegistrationController extends BaseController returnList = getEnforcementRegistrations(enforcementRegistration); return getDataTable(returnList); } + @RequiresPermissions("code:registration:list") + @PostMapping("/unionList") + @ResponseBody + public TableDataInfo unionList(EnforcementRegistration enforcementRegistration) + { + List returnList = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); + return getDataTable(returnList); + } private List getEnforcementRegistrations(EnforcementRegistration enforcementRegistration) { List returnList; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelCityController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelCityController.java index e4d6c027..a0d468b6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelCityController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelCityController.java @@ -1,5 +1,7 @@ package com.zdxt.code.controller; +import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.DeptApi; import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.UserApi; @@ -13,6 +15,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,10 +28,37 @@ public class StatisticalPanelCityController extends BaseController { @Autowired private IStatisticalPaneCityService i_statisticalPaneCityService; + @Autowired private DeptApi deptApi; + @Autowired private UserApi userApi; /*------------------------------------------综合分析-新版--------------------------------*/ @GetMapping("/city-direct") - public String cityDirect(Model model) { return "project/code/statistical-new/city-direct"; } + public String cityDirect(Model model) { + UserBean ub = userApi.getCurrentUser(); + DeptBean deptBean = deptApi.getDeptById(ub.getDeptId()); + if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("深圳市司法局")) { + // 市司法局 + model.addAttribute("roleFlag",99); + } else if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("司法局")) { + // 区司法局 + model.addAttribute("roleFlag",9); + } else { + deptBean = deptApi.iterationDeptParentToBureau(ub.getDeptId()); + if (null == deptBean) { + model.addAttribute("roleFlag",99); + } else if (4 == deptBean.getZone()) { + // 街道 + model.addAttribute("roleFlag",4); + } else if (3 == deptBean.getZone()) { + // 区直 + model.addAttribute("roleFlag",3); + } else if (1 == deptBean.getZone()) { + // 市值 + model.addAttribute("roleFlag",1); + } + } + return "project/code/statistical-new/city-direct"; + } /** 市数据 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java index 8455e7bb..7e8721b0 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java @@ -258,7 +258,10 @@ public class StatisticalPanelController extends BaseController { resMap.put("roleDept", deptName); } else { deptBean = deptApi.iterationDeptParentToBureau(ub.getDeptId()); - if (4 == deptBean.getZone()) { + if (null == deptBean) { + resMap.put("roleFlag", 99); + resMap.put("roleDept", ""); + } else if (4 == deptBean.getZone()) { // 街道 resMap.put("roleFlag", 4); resMap.put("roleDept", deptBean.getDeptName()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelDistrictController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelDistrictController.java index 1db60471..44080658 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelDistrictController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelDistrictController.java @@ -1,5 +1,7 @@ package com.zdxt.code.controller; +import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.DeptApi; import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.UserApi; @@ -26,10 +28,37 @@ public class StatisticalPanelDistrictController extends BaseController { @Autowired private IStatisticalPaneDistrictService i_statisticalPaneDistrictService; + @Autowired private DeptApi deptApi; + @Autowired private UserApi userApi; /*------------------------------------------综合分析-新版--------------------------------*/ @GetMapping("/district-direct") - public String districtDirect(Model model) { return "project/code/statistical-new/district-direct"; } + public String districtDirect(Model model) { + UserBean ub = userApi.getCurrentUser(); + DeptBean deptBean = deptApi.getDeptById(ub.getDeptId()); + if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("深圳市司法局")) { + // 市司法局 + model.addAttribute("roleFlag",99); + } else if (java.util.Objects.toString(deptBean.getZzDisplayPath(), "").contains("司法局")) { + // 区司法局 + model.addAttribute("roleFlag",9); + } else { + deptBean = deptApi.iterationDeptParentToBureau(ub.getDeptId()); + if (null == deptBean) { + model.addAttribute("roleFlag",99); + } else if (4 == deptBean.getZone()) { + // 街道 + model.addAttribute("roleFlag",4); + } else if (3 == deptBean.getZone()) { + // 区直 + model.addAttribute("roleFlag",3); + } else if (1 == deptBean.getZone()) { + // 市值 + model.addAttribute("roleFlag",1); + } + } + return "project/code/statistical-new/district-direct"; + } /** 市数据 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java index e308d6e3..79fbddf4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqOrderFlow.java @@ -36,7 +36,7 @@ public class MssqOrderFlow extends BaseDomain { /** * 文件 */ - private AppFiles appFiles; +// private AppFiles appFiles; private String appOrgShortname; public String getAppOrgName() { @@ -87,13 +87,13 @@ public class MssqOrderFlow extends BaseDomain { this.state = state; } - public AppFiles getAppFiles() { - return appFiles; - } - - public void setAppFiles(AppFiles appFiles) { - this.appFiles = appFiles; - } +// public AppFiles getAppFiles() { +// return appFiles; +// } +// +// public void setAppFiles(AppFiles appFiles) { +// this.appFiles = appFiles; +// } public String getAppOrgShortname() { return appOrgShortname; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index d50a8998..00da63ac 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -168,8 +168,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi enterpriseComplaint.setId(IdUtil.simpleUUID()); //默认工单为已受理 enterpriseComplaint.setStatus(0); - //TODO 暂时注释，后续启用 -// complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint); + //TODO 之前注释，现在启用 + complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); if(i==0)return i; // 更新记录表投诉状态 0行政 1非行政 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 4b67534e..ebb99bed 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -75,8 +75,8 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc Set bureauDeptNames = new HashSet(); Set bureauDeptIds = new HashSet(); for (EnterpriseLawEnforcement tmp : lawUnites) { - bureauDeptNames.add(tmp.getLawEnforcement()); - bureauDeptIds.add(tmp.getLawEnforcementId()); + bureauDeptNames.add(tmp.getBureauDeptName()); + bureauDeptIds.add(tmp.getBureauDeptId()); } enterpriseLawEnforcement.setBureauDeptName(String.join(",", bureauDeptNames)); enterpriseLawEnforcement.setBureauDeptId(String.join(",", bureauDeptIds)); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java index 1485a210..dc3bf5be 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java @@ -290,7 +290,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg row.createCell(2).setCellValue(li.getArea()); row.createCell(3).setCellValue(li.getStreet()); row.createCell(4).setCellValue(li.getLawEnforcer()); - row.createCell(5).setCellValue(DateUtils.parseDateToStr("YYYY-MM-dd HH:mm:ss",li.getEnforcementTime())); + row.createCell(5).setCellValue(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",li.getEnforcementTime())); row.createCell(6).setCellValue(li.getLawEnforcementTypeText()); row.createCell(7).setCellValue(li.getLawEnforcementItemText()); row.createCell(8).setCellValue(li.getLawEnforcementBasisText()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 2044e6ba..7fa9b695 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -529,7 +529,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"