From dff717d47b5117da077dbb892152ed948270bfc9 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Mon, 24 Mar 2025 17:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=8A=95=E8=AF=89?= =?UTF-8?q?=E4=B8=BE=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../complaintReportDetails.html | 118 ++++++++++++++++ .../complaintsReport/complaintsReport.html | 133 ++++++++++++++++++ .../ComplaintsReportController.java | 104 ++++++++++++++ .../zdxt/code/domain/ComplaintStatistics.java | 81 ++++++++--- .../zdxt/code/domain/EnterpriseComplaint.java | 19 ++- .../com/zdxt/code/domain/MssqOrderFlow.java | 11 ++ .../java/com/zdxt/code/domain/SearchType.java | 18 +++ .../mapper/ComplaintStatisticsMapper.java | 12 ++ .../code/service/ComplaintsReportService.java | 22 +++ .../service/impl/ComplaintStatisticsImpl.java | 4 +- .../impl/ComplaintsReportServiceImpl.java | 84 +++++++++++ .../mapper/ComplaintStatisticsMapper.xml | 27 ++++ 12 files changed, 611 insertions(+), 22 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintReportDetails.html create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintsReport.html create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintsReportController.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintsReportService.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintsReportServiceImpl.java diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintReportDetails.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintReportDetails.html new file mode 100644 index 00000000..96be8c83 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintReportDetails.html @@ -0,0 +1,118 @@ + + + + + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+ + +
+

+
    +
  • 处理部门：

    • +
  • 处理意见：

    • +
  • 处理结果：

    • +
  • 处理时间：

    • + +
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintsReport.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintsReport.html new file mode 100644 index 00000000..32a42c40 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintsReport/complaintsReport.html @@ -0,0 +1,133 @@ + + + + + + + + + +
+
+
+
+
+
+
    +
  • +

    被投诉对象：

    + +
    • +
  • +

    投诉类型：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintsReportController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintsReportController.java new file mode 100644 index 00000000..5d616d78 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintsReportController.java @@ -0,0 +1,104 @@ +package com.zdxt.code.controller; + +import com.zdxt.auth.framework.web.controller.BaseController; +import com.zdxt.auth.framework.web.page.TableDataInfo; +import com.zdxt.code.domain.ComplaintStatistics; +import com.zdxt.code.domain.MssqOrderFlow; +import com.zdxt.code.domain.SearchType; +import com.zdxt.code.service.ComplaintsReportService; +import com.zdxt.code.service.IEnterpriseComplaintService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@Controller +@RequestMapping("/code/complaintsReport") +public class ComplaintsReportController extends BaseController { + private String prefix = "project/code/complaintsReport"; + @Autowired + private ComplaintsReportService complaintsReportService; + @Autowired + private IEnterpriseComplaintService iEnterpriseComplaintService; + + @RequiresPermissions("code:complaintsReport:view") + @GetMapping() + public String complaintStatic(Model model) { + return prefix + "/complaintsReport"; + } + + @RequiresPermissions("code:complaintsReport:view") + @PostMapping("/list") + @ResponseBody + public TableDataInfo complaintGetComplaintDepartment(SearchType searchType) { + startPage(); + List list = complaintsReportService.complaintGetComplaintDepartment(searchType); + return getDataTable(list); + } + + @GetMapping("/details/{id}") + public String complaintsReportDetails(@PathVariable("id") String id, Model model) { + ComplaintStatistics complaintStatistics = complaintsReportService.complaintById(id); + model.addAttribute("complaintStatistics", complaintStatistics); + List mssqOrderFlowList = iEnterpriseComplaintService.selectEnterpriseComplaintProcess(complaintStatistics.getCid()); +/* MssqOrderFlow mssqOrderFlow1=new MssqOrderFlow(); + mssqOrderFlow1.setAppOrgName("处理部门1"); + mssqOrderFlow1.setApproveContent("处理1"); + mssqOrderFlow1.setApproveTime("2025-03-20 12:30"); + MssqOrderFlow mssqOrderFlow2=new MssqOrderFlow(); + mssqOrderFlow2.setAppOrgName("处理部门2"); + mssqOrderFlow2.setApproveContent("处理2"); + mssqOrderFlow2.setApproveTime("2025-03-20 14:30"); + mssqOrderFlowList.add(mssqOrderFlow2); + mssqOrderFlowList.add(mssqOrderFlow1);*/ + model.addAttribute("mssqOrderFlowList", mssqOrderFlowList); + return prefix + "/complaintReportDetails.html"; + } + + /*民生诉求查询结果： + + { + "result": + "{\"resultCode\":0,\"resultMsg\":\"查询成功\",\"approveDatas\":[{\"appFiles\":[],\"approveType\":0,\"appOrgName\":\"市统一受理分拨中心\",\"approveUserNo\":\"hwbz\",\"stateDesc\":\"派单员审核\",\"proWoId\":\"ae81062ab30d4e24bdeae3c42b2946c7\",\"backReasonNorx\":null,\"proWoCode\":\"672408011518283246701\",\"approveUserId\":\"8b0008377cd84e25914afc738fa37b17\",\"backReason\":null,\"approveUserName\":\"诉求受理员\",\"shortHandleName\":\"分拨\",\"appOrgShortname\":\"市统一受理分拨中心\",\"operName\":\"拟交办/转送处理\",\"approveContent\":\"测试\",\"id\":\"b66633f8ea7148ea87decda51b90850d\",\"replyContent\":null,\"state\":2,\"approveTime\":\"2024-08-01 15:38:39\",\"assignOrgName\":\"政通\"},{\"appFiles\":[],\"approveType\":0,\"appOrgName\":\"政通\",\"approveUserNo\":\"xiaoyuming\",\"stateDesc\":\"职能局处理\",\"proWoId\":\"ae81062ab30d4e24bdeae3c42b2946c7\",\"backReasonNorx\":\"\",\"proWoCode\":\"672408011518283246701\",\"approveUserId\":\"1582564358314156033\",\"backReason\":\"\",\"approveUserName\":\"肖裕明\",\"shortHandleName\":\"处置\",\"appOrgShortname\":\"政通\",\"operName\":\"处理完成，转市民生诉求平台复核\",\"approveContent\":\"测试\",\"id\":\"041c90c61890469fb665992a7429c2bf\",\"replyContent\":\"测试\",\"state\":7,\"approveTime\":\"2024-08-01 15:39:53\",\"assignOrgName\":\"市统一受理分拨中心\"},{\"appFiles\":[],\"approveType\":2,\"appOrgName\":\"市统一受理分拨中心\",\"approveUserNo\":\"hwbz\",\"stateDesc\":\"机构复核\",\"proWoId\":\"ae81062ab30d4e24bdeae3c42b2946c7\",\"backReasonNorx\":\"\",\"proWoCode\":\"672408011518283246701\",\"approveUserId\":\"8b0008377cd84e25914afc738fa37b17\",\"backReason\":\"\",\"approveUserName\":\"诉求受理员\",\"shortHandleName\":\"办结审核\",\"appOrgShortname\":\"市统一受理分拨中心\",\"operName\":\"审核通过，工单办结\",\"approveContent\":\"复核通过，办结工单。\",\"id\":\"d260312476854396b251bf007678f61d\",\"replyContent\":null,\"state\":8,\"approveTime\":\"2024-08-01 15:40:45\",\"assignOrgName\":null},{\"appFiles\":[],\"approveType\":99,\"appOrgName\":null,\"approveUserNo\":null,\"stateDesc\":\"\",\"proWoId\":\"ae81062ab30d4e24bdeae3c42b2946c7\",\"backReasonNorx\":null,\"proWoCode\":\"672408011518283246701\",\"approveUserId\":null,\"backReason\":null,\"approveUserName\":\"市民评价\",\"shortHandleName\":\"市民评价\",\"appOrgShortname\":\"市民评价\",\"operName\":\"市民评价\",\"approveContent\":\"非常满意\",\"id\":\"e4b771bb315bc57fce2bd7633727a92e\",\"replyContent\":null,\"state\":null,\"approveTime\":\"2024-08-02 10:07:56\",\"assignOrgName\":null}]}", "code": + 200 + } +2025-03-24 10:08:11,719INFO [http-nio-85-exec-7]c.z.c.s.IEnterpriseComplaintService [EnterpriseComplaintServiceImpl.java :115]查询工单信息结果返回： + + { + "resultCode":0, "resultMsg":"查询成功", "approveDatas":[{ + "appFiles":[],"approveType":0, "appOrgName":"市统一受理分拨中心", "approveUserNo":"hwbz", "stateDesc": + "派单员审核", "proWoId":"ae81062ab30d4e24bdeae3c42b2946c7", "backReasonNorx":null, "proWoCode": + "672408011518283246701", "approveUserId":"8b0008377cd84e25914afc738fa37b17", "backReason": + null, "approveUserName":"诉求受理员", "shortHandleName":"分拨", "appOrgShortname": + "市统一受理分拨中心", "operName":"拟交办/转送处理", "approveContent":"测试", "id": + "b66633f8ea7148ea87decda51b90850d", "replyContent":null, "state":2, "approveTime": + "2024-08-01 15:38:39", "assignOrgName":"政通" + },{ + "appFiles":[],"approveType":0, "appOrgName":"政通", "approveUserNo":"xiaoyuming", "stateDesc": + "职能局处理", "proWoId":"ae81062ab30d4e24bdeae3c42b2946c7", "backReasonNorx":"", "proWoCode": + "672408011518283246701", "approveUserId":"1582564358314156033", "backReason":"", "approveUserName": + "肖裕明", "shortHandleName":"处置", "appOrgShortname":"政通", "operName": + "处理完成，转市民生诉求平台复核", "approveContent":"测试", "id": + "041c90c61890469fb665992a7429c2bf", "replyContent":"测试", "state":7, "approveTime": + "2024-08-01 15:39:53", "assignOrgName":"市统一受理分拨中心" + },{ + "appFiles":[],"approveType":2, "appOrgName":"市统一受理分拨中心", "approveUserNo":"hwbz", "stateDesc": + "机构复核", "proWoId":"ae81062ab30d4e24bdeae3c42b2946c7", "backReasonNorx":"", "proWoCode": + "672408011518283246701", "approveUserId":"8b0008377cd84e25914afc738fa37b17", "backReason":"", "approveUserName": + "诉求受理员", "shortHandleName":"办结审核", "appOrgShortname":"市统一受理分拨中心", "operName": + "审核通过，工单办结", "approveContent":"复核通过，办结工单。", "id": + "d260312476854396b251bf007678f61d", "replyContent":null, "state":8, "approveTime": + "2024-08-01 15:40:45", "assignOrgName":null + },{ + "appFiles":[],"approveType":99, "appOrgName":null, "approveUserNo":null, "stateDesc":"", "proWoId": + "ae81062ab30d4e24bdeae3c42b2946c7", "backReasonNorx":null, "proWoCode":"672408011518283246701", "approveUserId": + null, "backReason":null, "approveUserName":"市民评价", "shortHandleName":"市民评价", "appOrgShortname": + "市民评价", "operName":"市民评价", "approveContent":"非常满意", "id": + "e4b771bb315bc57fce2bd7633727a92e", "replyContent":null, "state":null, "approveTime": + "2024-08-02 10:07:56", "assignOrgName":null + }]}*/ +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java index dc6e18d9..ded1e90a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java @@ -5,27 +5,38 @@ import com.zdxt.common.BaseDomain; import java.util.List; public class ComplaintStatistics extends BaseDomain { - public String id; - public String cid; - public String rid; - public String complaintTime; - public int complaintType; - public String complaintDepartment; - public String complaintDepartmentId; - public List complaintDepartmentIdList; - public String enterpriseName; - public String enterpriseNumber; - public int enforceType; - public String problemDescription; - public String linkman; - public String linkmanTel; - public String enterpriseAddress; - public String beginTime; - public String endTime; - public String total; + private String id; + private String cid; + private String rid; + private String complaintTime; + private int complaintType; + private String complaintDepartment; + private String complaintDepartmentId; + private List complaintDepartmentIdList; + private String enterpriseName; + private String enterpriseNumber; + private int enforceType; + private String problemDescription; + private String linkman; + private String linkmanTel; + private String enterpriseAddress; + private String beginTime; + private String endTime; + private String total; private Integer nullType; - public List fileList; + private List fileList; + private EnterpriseComplaint enterpriseComplaint; + private String proWoCode; + /** + * 工单处理进度 + */ + private String progress; + /** + * 工单处理结果 + */ + private String results; + public String getId() { return id; } @@ -185,4 +196,36 @@ public class ComplaintStatistics extends BaseDomain { public void setFileList(List fileList) { this.fileList = fileList; } + + public EnterpriseComplaint getEnterpriseComplaint() { + return enterpriseComplaint; + } + + public void setEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint) { + this.enterpriseComplaint = enterpriseComplaint; + } + + public String getProWoCode() { + return proWoCode; + } + + public void setProWoCode(String proWoCode) { + this.proWoCode = proWoCode; + } + + public String getProgress() { + return progress; + } + + public void setProgress(String progress) { + this.progress = progress; + } + + public String getResults() { + return results; + } + + public void setResults(String results) { + this.results = results; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index 409de15c..ef2fa577 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -89,7 +89,8 @@ public class EnterpriseComplaint extends BaseDomain * 投诉事项编码 多个逗号隔开 */ private String complaintItemNames; - + private String enforceTypeStr; +private String createTimeStr; public String getEnforcementTime() { return enforcementTime; } @@ -434,6 +435,22 @@ public class EnterpriseComplaint extends BaseDomain this.complaintItemNames = complaintItemNames; } + public String getEnforceTypeStr() { + return enforceTypeStr; + } + + public void setEnforceTypeStr(String enforceTypeStr) { + this.enforceTypeStr = enforceTypeStr; + } + + public String getCreateTimeStr() { + return createTimeStr; + } + + public void setCreateTimeStr(String createTimeStr) { + this.createTimeStr = createTimeStr; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 0e4953f9..e308d6e3 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 @@ -37,6 +37,7 @@ public class MssqOrderFlow extends BaseDomain { * 文件 */ private AppFiles appFiles; + private String appOrgShortname; public String getAppOrgName() { return appOrgName; @@ -93,6 +94,15 @@ public class MssqOrderFlow extends BaseDomain { public void setAppFiles(AppFiles appFiles) { this.appFiles = appFiles; } + + public String getAppOrgShortname() { + return appOrgShortname; + } + + public void setAppOrgShortname(String appOrgShortname) { + this.appOrgShortname = appOrgShortname; + } + class AppFiles { /** * 文件名称 @@ -118,6 +128,7 @@ public class MssqOrderFlow extends BaseDomain { public void setFileUrl(String fileUrl) { this.fileUrl = fileUrl; } + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java index 803e7cee..9e6c3882 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java @@ -34,6 +34,8 @@ public class SearchType implements Cloneable{ private String enterpriseName; private String enterpriseNumber; private String enterpriseAddress; + private Integer pageNumber; + private Integer pageSize; public List getAreaStreet() { return areaStreet; @@ -243,6 +245,22 @@ public class SearchType implements Cloneable{ this.enterpriseAddress = enterpriseAddress; } + public Integer getPageNumber() { + return pageNumber; + } + + public void setPageNumber(Integer pageNumber) { + this.pageNumber = pageNumber; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + public SearchType(){} public SearchType(SearchType searchType){ this.areaStreet=searchType.getAreaStreet(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java index 52476366..3c7d646c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java @@ -29,4 +29,16 @@ public interface ComplaintStatisticsMapper { * @return */ List selectComplaintStatisticsLEFTEnterpriseList(ComplaintStatistics complaintStatistics); + /** + * 获取投诉举报列表，合并两个投诉表的投诉部门 + * @param searchType + * @return + */ + List complaintGetComplaintDepartment(SearchType searchType); + /** + * 根据投诉统计id获取投诉举报详情 + * @param id + * @return + */ + ComplaintStatistics complaintGetComplaintDepartmentById(String id); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintsReportService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintsReportService.java new file mode 100644 index 00000000..6f4d0ed8 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintsReportService.java @@ -0,0 +1,22 @@ +package com.zdxt.code.service; + +import com.zdxt.code.domain.ComplaintStatistics; +import com.zdxt.code.domain.SearchType; + +import java.util.List; + +public interface ComplaintsReportService { + /** + * 获取投诉举报列表，合并两个投诉表的投诉部门 + * @param searchType + * @return + */ + List complaintGetComplaintDepartment(SearchType searchType); + + /** + * 根据投诉统计id获取投诉举报详情 + * @param id + * @return + */ + ComplaintStatistics complaintById(String id); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java index 7bd59e15..4b979541 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java @@ -230,8 +230,8 @@ public class ComplaintStatisticsImpl implements ComplaintStatisticsService { } List complaintStatisticsList=complaintStatisticsMapper.selectComplaintStatisticsGroup(complaintStatistics); for (int i=0;i complaintGetComplaintDepartment(SearchType searchType) { + List list=complaintStatisticsMapper.complaintGetComplaintDepartment(searchType); + for(int i = 0; i<(Math.min(list.size(), searchType.getPageNumber() * searchType.getPageSize())); i++){ +/* List mssqOrderFlowList =iEnterpriseComplaintService.selectEnterpriseComplaintProcess(list.get(i).getCid()); + if(mssqOrderFlowList.size()>0){ + list.get(i).setProgress(mssqOrderFlowList.get(0).getOperName()); + if(mssqOrderFlowList.get(0).getState()==20){ + list.get(i).setResults("已处理"); + }else{ + list.get(i).setResults("处理中"); + } + }*/ +/* list.get(i).setProgress("市统一受理分拨中心"); + list.get(i).setResults("拟交办/转送处理");*/ + List mssqOrderFlowList =iEnterpriseComplaintService.selectEnterpriseComplaintProcess(list.get(i).getCid()); + if(mssqOrderFlowList.size()>0) { + list.get(i).setProgress(mssqOrderFlowList.get(0).getAppOrgShortname()); + list.get(i).setResults(mssqOrderFlowList.get(0).getOperName()); + } + } + return list; + } + + @Override + public ComplaintStatistics complaintById(String id) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + ComplaintStatistics complaintStatistics = complaintStatisticsMapper.complaintGetComplaintDepartmentById(id); + EnterpriseComplaint enterpriseComplaint = enterpriseComplaintMapper.selectEnterpriseComplaintById(complaintStatistics.getCid()); + ZdxtFileCommon zdxtFileCommon = new ZdxtFileCommon(); + zdxtFileCommon.setBusinessId(complaintStatistics.getCid()); + List zdxtFileCommonList = zdxtFileCommonMapper.selectZdxtFileList(zdxtFileCommon); + if (zdxtFileCommonList.size() > 0) { + complaintStatistics.setFileList(zdxtFileCommonList.stream().map(ZdxtFileCommon::getUploadPath).collect(Collectors.toList())); + } + String enforceTypeText = dictDataMapper.selectDictLabel("caseType", enterpriseComplaint.getEnforceType() + ""); + if (enforceTypeText == null || enforceTypeText.isEmpty()) { + enterpriseComplaint.setEnforceTypeStr(enterpriseComplaint.getEnforceType() + ""); + } else { + enterpriseComplaint.setEnforceTypeStr(enforceTypeText); + } + enterpriseComplaint.setCreateTimeStr(simpleDateFormat.format(enterpriseComplaint.getCreateTime())); + complaintStatistics.setEnterpriseComplaint(enterpriseComplaint); + return complaintStatistics; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml index 9d1c1545..9a3c083d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml @@ -18,6 +18,7 @@ + @@ -160,4 +161,30 @@ + + \ No newline at end of file