diff --git a/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java b/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java index 3d6b7c0..613c4fc 100755 --- a/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java +++ b/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java @@ -14,6 +14,7 @@ import com.cm.systemcity.pojo.vos.IdsVO; import com.cm.systemcity.pojo.vos.reportcase.*; import com.cm.systemcity.service.readstate.IReadStateService; import com.cm.systemcity.service.reportcase.IReportCaseService; +import com.cm.systemcity.service.reportcase.impl.ReportCaseServiceImpl; import freemarker.template.TemplateException; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; @@ -624,4 +625,22 @@ public class ReportCaseController extends AbstractController { reportCaseService.updateReportCase(params); return new SuccessResult(); } + + /** + * 区域下数据数量 + * 需要传入 areaParentId 统计该地区下级信息 + */ + @GetMapping("data-counts/{level}") + public List dataCount(@PathVariable("level") Integer level){ + Map params = requestParams(); + return reportCaseService.dataCount(level, params); + } + + @ApiOperation(value = "导出自上报案件数量", notes = "导出自上报案件数量接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("export-datacount") + public void exportDataCount(HttpServletResponse response) throws Exception { + Map params = requestParams(); + reportCaseService.exportDataCount(response, params); + } } diff --git a/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java b/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java index 21937b6..99bba36 100755 --- a/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java +++ b/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java @@ -384,4 +384,6 @@ public interface IReportCaseDao { List listDept(Map params); Integer countReportCaseAssign(Map reportCaseAssignMap); + + List> countData(Map params); } diff --git a/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/CaseCountDTO.java b/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/CaseCountDTO.java new file mode 100644 index 0000000..7737c59 --- /dev/null +++ b/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/CaseCountDTO.java @@ -0,0 +1,80 @@ +package com.cm.systemcity.pojo.dtos.reportcase; + +import io.swagger.annotations.ApiModelProperty; + +/** + * @author xwangs + * @create 2020-12-07 14:29 + * @description + */ +public class CaseCountDTO { + + @ApiModelProperty(name = "name", value = "级别") + private String name; + @ApiModelProperty(name = "count", value = "数量") + private String count; + @ApiModelProperty(name = "level", value = "级别") + private Integer level; + @ApiModelProperty(name = "dataId", value = "数据ID") + private String dataId; + @ApiModelProperty(name = "prpeDataId", value = "上一级数据ID") + private String prpeDataId; + @ApiModelProperty(name = "dataId", value = "上一级级别") + private Integer prpeLevel; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCount() { + return count; + } + + public void setCount(String count) { + this.count = count; + } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public String getDataId() { + return dataId; + } + + public void setDataId(String dataId) { + this.dataId = dataId; + } + + public String getPrpeDataId() { + return prpeDataId; + } + + public void setPrpeDataId(String prpeDataId) { + this.prpeDataId = prpeDataId; + } + + public Integer getPrpeLevel() { + return prpeLevel; + } + + public void setPrpeLevel(Integer prpeLevel) { + this.prpeLevel = prpeLevel; + } + + @Override + public String toString() { + return "CaseCountDTO{" + + "name='" + name + '\'' + + ", count='" + count + '\'' + + '}'; + } +} diff --git a/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java b/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java index 22e02a1..75fe67c 100755 --- a/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java @@ -9,6 +9,7 @@ import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; import com.cm.systemcity.pojo.dtos.reportcase.*; +import com.cm.systemcity.service.reportcase.impl.ReportCaseServiceImpl; import freemarker.template.TemplateException; import javax.servlet.http.HttpServletResponse; @@ -492,5 +493,9 @@ public interface IReportCaseService { SuccessResultList> listReportCaseComplex(ListPage page); - void removeToComplexCases(Map params); + void removeToComplexCases(java.util.Map params); + + List dataCount(Integer level, Map params); + + void exportDataCount(HttpServletResponse response, Map params); } diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java index 386faf6..01b049c 100755 --- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java @@ -1,5 +1,6 @@ package com.cm.systemcity.service.reportcase.impl; +import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cm.common.component.SecurityComponent; @@ -15,7 +16,6 @@ import com.cm.common.plugin.oauth.service.department.IDepartmentService; import com.cm.common.plugin.pojo.dtos.file.FileInfoWithPathDTO; import com.cm.common.pojo.ListPage; import com.cm.common.pojo.bos.UserInfoBO; -import com.cm.common.pojo.dtos.FileDTO; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; @@ -23,7 +23,6 @@ import com.cm.common.token.app.AppTokenManager; import com.cm.common.token.app.entity.AppToken; import com.cm.common.token.app.entity.AppTokenUser; import com.cm.common.utils.DateUtil; -import com.cm.common.utils.RequestUtil; import com.cm.common.utils.UUIDUtil; import com.cm.common.utils.ZipUtil; import com.cm.common.utils.point.Point; @@ -34,6 +33,7 @@ import com.cm.systemcity.pojo.ImageBase64; import com.cm.systemcity.pojo.dtos.AreaPointsDTO; import com.cm.systemcity.pojo.dtos.areapoints.GridAndPointsDTO; import com.cm.systemcity.pojo.dtos.bindingdepartment.BindingDepartmentDTO; +import com.cm.systemcity.pojo.dtos.community.CommunityDTO; import com.cm.systemcity.pojo.dtos.dict.DictDTO; import com.cm.systemcity.pojo.dtos.readstate.ReadStateDTO; import com.cm.systemcity.pojo.dtos.reportcase.*; @@ -60,12 +60,10 @@ import org.joda.time.format.DateTimeFormat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; -import java.awt.*; -import java.awt.image.BufferedImage; import java.io.*; import java.math.BigDecimal; +import java.net.URLEncoder; import java.text.NumberFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -2122,4 +2120,160 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer } return !PointUtil.isPointInPoly(point, points); } + + @Override + public List dataCount(Integer level, Map params) { + switch (level) { + case 1: + return dataCountLevel1(params); + case 2: + return dataCountLevel2(params); + case 3: + return dataCountLevel3(params); + case 4: + return dataCountLevel4(params); + } + return new ArrayList<>(); + } + + @Override + public void exportDataCount(HttpServletResponse response, Map params) { + Integer level = Integer.parseInt(params.get("level").toString()); + List caseCountDTOS = dataCount(level, params); + + String excelName = "自处理案件统计"; + String fileName = null; + try { + fileName = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + + String [] headers = {"序号", "级别", "数量"}; + List> listHeader = new ArrayList<>(); + for(String item : headers) { + List title = new ArrayList<>(); + title.add(item); + listHeader.add(title); + } + + List> listData = new ArrayList<>(); + int i = 0; + for (CaseCountDTO caseCountDTO : caseCountDTOS) { + i++; + List data = new ArrayList<>(); + data.add(i); + data.add(caseCountDTO.getName()); + data.add(caseCountDTO.getCount()); + listData.add(data); + } + try { + EasyExcel.write(response.getOutputStream()).sheet("自处理案件统计").head(listHeader).doWrite(listData); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 全区数据 + * + * @param params + */ + private List dataCountLevel1(Map params) { + List> resultMap = reportCaseDao.countData(params); + CaseCountDTO caseCountDTO = new CaseCountDTO(); + caseCountDTO.setName("全区"); + caseCountDTO.setCount(resultMap.get(0).get("count").toString()); + caseCountDTO.setLevel(1); + List caseCountDTOList = new ArrayList<>(); + caseCountDTOList.add(caseCountDTO); + return caseCountDTOList; + } + + /** + * 街道数据 + * + * @param params + */ + private List dataCountLevel2(Map params) { + // 获取所有的街道数据 + params.put("dictParentId", "9d179f05-3ea0-48f7-853c-d3b7124b791c"); + params.put("area", "yes"); + List> resultMapList = reportCaseDao.countData(params); + List dictDTOS = dictService.listDict(params); + List caseCountDTOList = new ArrayList<>(); + for (DictDTO dictDTO : dictDTOS) { + for (Map stringObjectMap : resultMapList) { + if (dictDTO.getDictId().equals(stringObjectMap.get("areaId").toString())) { + CaseCountDTO caseCountDTO = new CaseCountDTO(); + caseCountDTO.setName(dictDTO.getDictName()); + caseCountDTO.setCount(stringObjectMap.get("count").toString()); + caseCountDTO.setDataId(stringObjectMap.get("areaId").toString()); + caseCountDTO.setLevel(2); + caseCountDTO.setPrpeLevel(1); + caseCountDTO.setPrpeDataId("9d179f05-3ea0-48f7-853c-d3b7124b791c"); + caseCountDTOList.add(caseCountDTO); + } + } + } + return caseCountDTOList; + } + + /** + * 社区数据 + * + * @param params + */ + private List dataCountLevel3(Map params) { + // 获取所有的街道数据 + List communityDTOS = communityService.listCommunity(params); + params.put("community", "yes"); + if(null == params.get("areaId")) { + throw new SearchException("areaId不能为空"); + } + List> resultMapList = reportCaseDao.countData(params); + List caseCountDTOList = new ArrayList<>(); + for (CommunityDTO communityDTO : communityDTOS) { + for (Map stringObjectMap : resultMapList) { + if (communityDTO.getCommunityId().equals(stringObjectMap.get("communityId").toString())) { + CaseCountDTO caseCountDTO = new CaseCountDTO(); + caseCountDTO.setName(communityDTO.getCommunityName()); + caseCountDTO.setCount(stringObjectMap.get("count").toString()); + caseCountDTO.setDataId(stringObjectMap.get("communityId").toString()); + caseCountDTO.setLevel(3); + caseCountDTO.setPrpeLevel(2); + caseCountDTO.setPrpeDataId(params.get("areaId").toString()); + caseCountDTOList.add(caseCountDTO); + } + } + } + return caseCountDTOList; + } + + /** + * 网格员数据 + * + * @param params + */ + private List dataCountLevel4(Map params) { + params.put("creator", "yes"); + if(null == params.get("communityId")) { + throw new SearchException("communityId不能为空"); + } + List> maps = reportCaseDao.countData(params); + List caseCountDTOList = new ArrayList<>(); + for (Map map : maps) { + CaseCountDTO caseCountDTO = new CaseCountDTO(); + caseCountDTO.setName(map.get("caseReporter").toString()); + caseCountDTO.setCount(map.get("count").toString()); + caseCountDTO.setDataId(map.get("creator").toString()); + caseCountDTO.setLevel(4); + caseCountDTO.setPrpeLevel(3); + caseCountDTO.setPrpeDataId(params.get("prpeDataId").toString()); + caseCountDTO.setDataId(params.get("communityId").toString()); + caseCountDTOList.add(caseCountDTO); + } + return caseCountDTOList; + } } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml index cd79886..3122bbe 100755 --- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml +++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml @@ -35,19 +35,22 @@ - + - + - + @@ -56,7 +59,8 @@ - + @@ -66,7 +70,8 @@ - + @@ -111,45 +116,55 @@ + + + + + + + + + + - INSERT INTO city_report_case( - report_case_id, - case_number, - area_id, - area_name, - case_photos, - case_audio, - community_id, - community_name, - case_source, - case_status, - case_type_id, - case_type_name, - case_content, - case_longitude, - case_latitude, - case_position, - is_accept, - is_deny, - is_self, - case_flow_type, - case_flow_forward, - case_reporter, - creator, - gmt_create, - modifier, - gmt_modified, - is_delete - ) VALUES( - #{reportCaseId}, - #{caseNumber}, - #{areaId}, - #{areaName}, - #{casePhotos}, - #{caseAudio}, - #{communityId}, - #{communityName}, - #{caseSource}, - #{caseStatus}, - #{caseTypeId}, - #{caseTypeName}, - #{caseContent}, - #{caseLongitude}, - #{caseLatitude}, - #{casePosition}, - #{isAccept}, - #{isDeny}, - #{isSelf}, - #{caseFlowType}, - #{caseFlowForward}, - #{caseReporter}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + INSERT INTO city_report_case(report_case_id, + case_number, + area_id, + area_name, + case_photos, + case_audio, + community_id, + community_name, + case_source, + case_status, + case_type_id, + case_type_name, + case_content, + case_longitude, + case_latitude, + case_position, + is_accept, + is_deny, + is_self, + case_flow_type, + case_flow_forward, + case_reporter, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete) + VALUES (#{reportCaseId}, + #{caseNumber}, + #{areaId}, + #{areaName}, + #{casePhotos}, + #{caseAudio}, + #{communityId}, + #{communityName}, + #{caseSource}, + #{caseStatus}, + #{caseTypeId}, + #{caseTypeName}, + #{caseContent}, + #{caseLongitude}, + #{caseLatitude}, + #{casePosition}, + #{isAccept}, + #{isDeny}, + #{isSelf}, + #{caseFlowType}, + #{caseFlowForward}, + #{caseReporter}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete}) UPDATE - city_report_case + city_report_case SET - is_delete = 1, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + is_delete = 1, + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - report_case_id IN + report_case_id IN #{reportCaseIds[${index}]} @@ -319,14 +331,14 @@ UPDATE - city_report_case + city_report_case SET - is_delete = 1, - case_status = #{caseStatus}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + is_delete = 1, + case_status = #{caseStatus}, + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - report_case_id IN + report_case_id IN #{reportCaseIds[${index}]} @@ -335,7 +347,7 @@ UPDATE - city_report_case + city_report_case SET case_number = #{caseNumber}, @@ -404,45 +416,45 @@ is_delete = #{isDelete}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - report_case_id = #{reportCaseId} + report_case_id = #{reportCaseId} SELECT - t1.* + t1.* FROM - city_report_case t1 + city_report_case t1 WHERE - t1.is_delete = 0 + t1.is_delete = 0 - AND t1.report_case_id = #{reportCaseId} + AND t1.report_case_id = #{reportCaseId} - AND t1.case_number = #{caseNumber} + AND t1.case_number = #{caseNumber} - INSERT INTO city_report_case_accept( - case_id, - community_boss_id, - community_boss_name, - accept_status, - accept_opinion, - accept_user_name, - is_register, - creator, - gmt_create, - modifier, - gmt_modified, - is_delete - ) VALUES( - #{caseId}, - #{communityBossId}, - #{communityBossName}, - #{acceptStatus}, - #{acceptOpinion}, - #{acceptUserName}, - #{isRegister}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + INSERT INTO city_report_case_accept(case_id, + community_boss_id, + community_boss_name, + accept_status, + accept_opinion, + accept_user_name, + is_register, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete) + VALUES (#{caseId}, + #{communityBossId}, + #{communityBossName}, + #{acceptStatus}, + #{acceptOpinion}, + #{acceptUserName}, + #{isRegister}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete}) UPDATE - city_report_case_accept + city_report_case_accept SET community_boss_id = #{communityBossId}, @@ -701,41 +706,38 @@ is_register = #{isRegister}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - case_id = #{caseId} + case_id = #{caseId} - INSERT INTO city_report_case_register( - case_id, - register_opinion, - register_user_name, - is_assign, - creator, - gmt_create, - modifier, - gmt_modified, - is_delete - ) VALUES( - #{caseId}, - #{registerOpinion}, - #{registerUserName}, - #{isAssign}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + INSERT INTO city_report_case_register(case_id, + register_opinion, + register_user_name, + is_assign, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete) + VALUES (#{caseId}, + #{registerOpinion}, + #{registerUserName}, + #{isAssign}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete}) UPDATE - city_report_case_register + city_report_case_register SET register_opinion = #{registerOpinion}, @@ -746,30 +748,27 @@ is_assign = #{isAssign}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - case_id = #{caseId} + case_id = #{caseId} - INSERT INTO city_report_case_assign( - case_id, - handle_user_type, - handle_user_id, - handle_user_name, - handle_time, - assign_opinion, - assign_user_name, - is_handle, - creator, - gmt_create, - modifier, - gmt_modified, - is_delete - ) VALUE( - #{caseId}, + INSERT INTO city_report_case_assign(case_id, + handle_user_type, + handle_user_id, + handle_user_name, + handle_time, + assign_opinion, + assign_user_name, + is_handle, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete) VALUE ( #{caseId}, #{handleUserType}, #{handleUserId}, #{handleUserName}, @@ -782,13 +781,13 @@ #{modifier}, #{gmtModified}, #{isDelete} - ) + ) UPDATE - city_report_case_assign + city_report_case_assign SET handle_user_type = #{handleUserType}, @@ -808,135 +807,131 @@ is_handle = #{isHandle}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - case_id = #{caseId} + case_id = #{caseId} SELECT - t1.report_case_id, - t1.case_number, - t1.area_id, - t1.area_name, - t1.case_photos, - t1.case_audio, - t1.community_id, - t1.community_name, - t1.case_source, - t1.case_status, - t1.case_type_id, - t1.case_type_name, - t1.case_content, - t1.case_longitude, - t1.case_latitude, - t1.case_position, - t1.grade, - t1.is_accept, - t1.is_deny, - t1.is_self, - t1.case_reporter, - t1.creator, - LEFT(t1.gmt_create, 19) gmt_create, - t2.creator handle_user_id, - t2.handle_user_name, - t2.handle_time, - t2.handle_timeout, - t2.handle_opinion, - t2.handle_photos, - LEFT(t2.gmt_create, 19) handle_date + t1.report_case_id, + t1.case_number, + t1.area_id, + t1.area_name, + t1.case_photos, + t1.case_audio, + t1.community_id, + t1.community_name, + t1.case_source, + t1.case_status, + t1.case_type_id, + t1.case_type_name, + t1.case_content, + t1.case_longitude, + t1.case_latitude, + t1.case_position, + t1.grade, + t1.is_accept, + t1.is_deny, + t1.is_self, + t1.case_reporter, + t1.creator, + LEFT(t1.gmt_create, 19) gmt_create, + t2.creator handle_user_id, + t2.handle_user_name, + t2.handle_time, + t2.handle_timeout, + t2.handle_opinion, + t2.handle_photos, + LEFT(t2.gmt_create, 19) handle_date FROM - city_report_case t1 + city_report_case t1 INNER JOIN - city_report_case_handle t2 ON t1.report_case_id = t2.case_id AND t2.is_delete = 0 + city_report_case_handle t2 ON t1.report_case_id = t2.case_id AND t2.is_delete = 0 WHERE - t1.is_delete = 0 + t1.is_delete = 0 - AND t1.creator = #{reporterId} + AND t1.creator = #{reporterId} - AND t2.handle_user_id = #{handleUserId} + AND t2.handle_user_id = #{handleUserId} - AND t1.area_id = #{areaId} + AND t1.area_id = #{areaId} - AND t1.case_type_id = #{caseTypeId} + AND t1.case_type_id = #{caseTypeId} - AND t1.case_status = #{caseStatus} + AND t1.case_status = #{caseStatus} - AND t1.is_accept = #{isAccept} + AND t1.is_accept = #{isAccept} - AND LEFT(t1.gmt_create, 10) = ]]> #{startTime} + AND LEFT(t1.gmt_create, 10) = ]]> #{startTime} - AND LEFT(t1.gmt_create, 10) #{endTime} + AND LEFT(t1.gmt_create, 10) #{endTime} - AND t1.report_case_id IN + AND t1.report_case_id IN #{reportCaseIds[${index}]} - - - - - - - - - - - - + + + + + + + + + + + + AND - t1.report_case_id IN ( + t1.report_case_id IN ( SELECT - st1.case_id + st1.case_id FROM - city_report_case_assign st1 + city_report_case_assign st1 WHERE - st1.is_delete = 0 + st1.is_delete = 0 AND - st1.handle_user_id IN ( - SELECT - sst1.user_id - FROM - sys_department_user sst1 - INNER JOIN - sys_role_user sst2 - ON - sst1.user_id = sst2.user_id - AND - sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' - ) + st1.handle_user_id IN ( + SELECT + sst1.user_id + FROM + sys_department_user sst1 + INNER JOIN + sys_role_user sst2 + ON + sst1.user_id = sst2.user_id + AND + sst2.role_id = 'bc405346-8714-4ded-89ac-9cc4d755f66a' + ) ) @@ -1396,13 +1382,13 @@ ) ORDER BY - t1.gmt_modified DESC + t1.gmt_modified DESC UPDATE - city_report_case_handle + city_report_case_handle SET handle_time = #{handleTime}, @@ -1425,215 +1411,208 @@ grade = #{grade}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} WHERE - case_id = #{caseId} + case_id = #{caseId} - INSERT INTO city_report_case_inspect( - case_id, - inspect_user_name, - inspect_photos, - inspect_opinion, - is_pass, - is_close, - creator, - gmt_create, - modifier, - gmt_modified, - is_delete - ) VALUES( - #{caseId}, - #{inspectUserName}, - #{inspectPhotos}, - #{inspectOpinion}, - #{isPass}, - #{isClose}, - #{creator}, - #{gmtCreate}, - #{modifier}, - #{gmtModified}, - #{isDelete} - ) + INSERT INTO city_report_case_inspect(case_id, + inspect_user_name, + inspect_photos, + inspect_opinion, + is_pass, + is_close, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete) + VALUES (#{caseId}, + #{inspectUserName}, + #{inspectPhotos}, + #{inspectOpinion}, + #{isPass}, + #{isClose}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete}) - DELETE FROM - city_report_case_assign - WHERE - case_id = #{caseId} + DELETE + FROM city_report_case_assign + WHERE case_id = #{caseId} - DELETE FROM - city_report_case_handle - WHERE - case_id = #{caseId} + DELETE + FROM city_report_case_handle + WHERE case_id = #{caseId} - DELETE FROM - city_report_case_register - WHERE - case_id = #{caseId} + DELETE + FROM city_report_case_register + WHERE case_id = #{caseId} - DELETE FROM - city_report_case_accept - WHERE - case_id = #{caseId} + DELETE + FROM city_report_case_accept + WHERE case_id = #{caseId} UPDATE - city_report_case_inspect + city_report_case_inspect SET inspect_user_name = #{inspectUserName}, @@ -1650,24 +1629,21 @@ is_close = #{isClose}, - modifier = #{modifier}, - gmt_modified = #{gmtModified} + modifier = #{modifier}, + gmt_modified = #{gmtModified} - INSERT INTO city_report_case_close( - case_id, - close_user_name, - close_opinion, - is_placeonfile, - creator, - gmt_create, - modifier, - gmt_modified, - is_delete - ) VALUE ( - #{caseId}, + INSERT INTO city_report_case_close(case_id, + close_user_name, + close_opinion, + is_placeonfile, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete) VALUE ( #{caseId}, #{closeUserName}, #{closeOpinion}, #{isPlaceonfile}, @@ -1676,60 +1652,57 @@ #{modifier}, #{gmtModified}, #{isDelete} - ) + ) - INSERT INTO city_report_case_log( - case_id, - option_type, - user_id, - user_name, - user_phone, - user_opinion, - user_photos, - user_audio, - handle_user_id, - handle_user_name, - handle_time, - handle_status, - gmt_create - ) VALUES( - #{caseId}, - #{optionType}, - #{userId}, - #{userName}, - #{userPhone}, - #{userOpinion}, - #{userPhotos}, - #{userAudio}, - #{handleUserId}, - #{handleUserName}, - #{handleTime}, - #{handleStatus}, - #{gmtCreate} - ) + INSERT INTO city_report_case_log(case_id, + option_type, + user_id, + user_name, + user_phone, + user_opinion, + user_photos, + user_audio, + handle_user_id, + handle_user_name, + handle_time, + handle_status, + gmt_create) + VALUES (#{caseId}, + #{optionType}, + #{userId}, + #{userName}, + #{userPhone}, + #{userOpinion}, + #{userPhotos}, + #{userAudio}, + #{handleUserId}, + #{handleUserName}, + #{handleTime}, + #{handleStatus}, + #{gmtCreate}) - SELECT - t1.report_case_id, - t1.case_number, - t1.area_id, - t1.area_name, - t1.case_photos, - t1.case_audio, - t1.community_id, - t1.community_name, - t1.case_source, - t1.case_status, - t1.case_type_id, - t1.case_type_name, - t1.case_content, - t1.case_longitude, - t1.case_latitude, - t1.case_position, - t1.is_accept, - t1.is_deny, - t1.is_self, - t1.case_reporter, - t1.creator, - LEFT(t1.gmt_create, 19) gmt_create, - t3.creator handle_user_id, - t3.handle_user_name, - t3.handle_time, - t3.handle_timeout, - t3.handle_opinion, - t3.handle_photos, - LEFT(t3.gmt_create, 19) handle_date + SELECT t1.report_case_id, + t1.case_number, + t1.area_id, + t1.area_name, + t1.case_photos, + t1.case_audio, + t1.community_id, + t1.community_name, + t1.case_source, + t1.case_status, + t1.case_type_id, + t1.case_type_name, + t1.case_content, + t1.case_longitude, + t1.case_latitude, + t1.case_position, + t1.is_accept, + t1.is_deny, + t1.is_self, + t1.case_reporter, + t1.creator, LEFT (t1.gmt_create, 19) gmt_create, t3.creator handle_user_id, t3.handle_user_name, t3.handle_time, t3.handle_timeout, t3.handle_opinion, t3.handle_photos, LEFT (t3.gmt_create, 19) handle_date FROM city_report_case t1 - LEFT JOIN city_report_case_assign t2 ON t1.report_case_id = t2.case_id AND t2.is_delete = 0 - LEFT JOIN city_report_case_handle t3 ON t1.report_case_id = t3.case_id AND t3.is_delete = 0 + LEFT JOIN city_report_case_assign t2 + ON t1.report_case_id = t2.case_id AND t2.is_delete = 0 + LEFT JOIN city_report_case_handle t3 ON t1.report_case_id = t3.case_id AND t3.is_delete = 0 WHERE t1.is_delete = 0 - AND ( - t1.case_status = 3 AND FIND_IN_SET(#{userId}, t2.handle_user_id) - OR - t1.case_status = 4 AND t1.creator = #{userId} - ) + AND ( + t1.case_status = 3 + AND FIND_IN_SET(#{userId} + , t2.handle_user_id) + OR + t1.case_status = 4 + AND t1.creator = #{userId} + ) ORDER BY t1.gmt_create DESC - UPDATE city_report_case SET - case_flow_forward = #{caseFlowForward} - WHERE - report_case_id = #{reportCaseId} + UPDATE city_report_case + SET case_flow_forward = #{caseFlowForward} + WHERE report_case_id = #{reportCaseId} SELECT - t1.case_id, - t1.handle_user_type, - t1.handle_user_id, - t1.handle_user_name, - t1.handle_time, - t1.handle_timeout, - t1.assign_opinion, - t1.assign_user_name, - t1.is_handle, - t1.creator, - t1.gmt_create, - t1.modifier, - t1.gmt_modified + t1.case_id, + t1.handle_user_type, + t1.handle_user_id, + t1.handle_user_name, + t1.handle_time, + t1.handle_timeout, + t1.assign_opinion, + t1.assign_user_name, + t1.is_handle, + t1.creator, + t1.gmt_create, + t1.modifier, + t1.gmt_modified FROM - city_report_case_assign t1 + city_report_case_assign t1 LEFT JOIN city_report_case_handle t2 ON t1.case_id = t2.case_id AND t2.is_delete = '0' WHERE - t1.is_delete = '0' + t1.is_delete = '0' AND t2.case_id IS NULL AND FIND_IN_SET(t1.handle_user_id,#{userIds}) @@ -2037,14 +1993,14 @@ SELECT - t2.case_id, - t2.gmt_create handleGmtCreate, - t3.case_id inspectCaseId, - t3.gmt_create inspectGmtCreate, - t1.creator + t2.case_id, + t2.gmt_create handleGmtCreate, + t3.case_id inspectCaseId, + t3.gmt_create inspectGmtCreate, + t1.creator FROM - city_report_case t1 + city_report_case t1 LEFT JOIN city_report_case_handle t2 ON t1.report_case_id = t2.case_id AND t2.is_delete = '0' LEFT JOIN city_report_case_inspect t3 ON t1.report_case_id = t3.case_id AND t2.is_delete = '0' WHERE - t1.is_delete = '0' + t1.is_delete = '0' AND t1.case_flow_type != '1' AND t1.case_status >= '4' @@ -2088,18 +2044,18 @@ - SELECT - handle_user_name handleUserName, - gmt_create handleCreateTime, - handle_opinion handleOpinion, - handle_photos handlePhotos - FROM - city_report_case_handle - WHERE is_delete = '0' AND case_id = #{caseId} + SELECT handle_user_name handleUserName, + gmt_create handleCreateTime, + handle_opinion handleOpinion, + handle_photos handlePhotos + FROM city_report_case_handle + WHERE is_delete = '0' + AND case_id = #{caseId} - INSERT INTO sys_role_user ( - role_id, user_id - ) values ( - #{roleId}, #{userId} - ) + INSERT INTO sys_role_user (role_id, user_id) + values (#{roleId}, #{userId}) SELECT - t1.case_id, - t1.handle_user_name, - t1.handle_timeout, - t1.handle_opinion, - t1.handle_photos, - t1.is_inspect, - t1.creator, - t1.gmt_create handle_create_time, - t1.modifier, - t1.gmt_modified, - jt2.department_name handle_user_department_name, - jt5.community_name handle_user_community_name, - jt6.user_username handle_user_username + t1.case_id, + t1.handle_user_name, + t1.handle_timeout, + t1.handle_opinion, + t1.handle_photos, + t1.is_inspect, + t1.creator, + t1.gmt_create handle_create_time, + t1.modifier, + t1.gmt_modified, + jt2.department_name handle_user_department_name, + jt5.community_name handle_user_community_name, + jt6.user_username handle_user_username FROM - city_report_case_handle t1 + city_report_case_handle t1 LEFT JOIN - sys_department_user jt1 ON t1.creator = jt1.user_id + sys_department_user jt1 ON t1.creator = jt1.user_id LEFT JOIN - sys_department jt2 ON jt1.department_id = jt2.department_id + sys_department jt2 ON jt1.department_id = jt2.department_id LEFT JOIN - city_community_boss jt3 ON t1.creator = jt3.community_boss_user_id + city_community_boss jt3 ON t1.creator = jt3.community_boss_user_id LEFT JOIN - city_community_boss_community jt4 ON jt3.community_boss_id = jt4.community_boss_id + city_community_boss_community jt4 ON jt3.community_boss_id = jt4.community_boss_id LEFT JOIN - city_community jt5 ON jt4.community_id = jt5.community_id + city_community jt5 ON jt4.community_id = jt5.community_id LEFT JOIN - sys_user jt6 ON t1.creator = jt6.user_id + sys_user jt6 ON t1.creator = jt6.user_id WHERE - t1.is_delete = '0' + t1.is_delete = '0' AND FIND_IN_SET(t1.creator,#{userIds}) @@ -2276,17 +2213,60 @@ + + \ No newline at end of file diff --git a/src/main/resources/static/route/reportcase/list-area-case.html b/src/main/resources/static/route/reportcase/list-area-case.html new file mode 100644 index 0000000..2abbc64 --- /dev/null +++ b/src/main/resources/static/route/reportcase/list-area-case.html @@ -0,0 +1,218 @@ + + + + + + + + + + + + + +
+
+
+
+
+ + +
+
+ + + + + + + + + + + + + +
级别数量
+
+
+
+
+
+ + + + + \ No newline at end of file