diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 215f9c1..9ee0f95 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -66,8 +66,9 @@ private IStatusService statusService; @Autowired private IProcessDetailService processDetailService; + @Override - public Integer countCaseToday(){ + public Integer countCaseToday() { return this.baseMapper.countCaseToday(); } @@ -77,7 +78,7 @@ */ @Transactional @Override - public boolean createNewPC(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId){ + public boolean createNewPC(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId) { //更新CASE表 //案卷录入时间 cwsCase.setCreateTime(new Date()); @@ -94,7 +95,7 @@ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); - caseid = todayDate + df.format(countCaseToday()+1); + caseid = todayDate + df.format(countCaseToday() + 1); cwsCase.setCaseid(caseid); insert(cwsCase); //往主表(CASE表)新增案卷 @@ -113,10 +114,10 @@ Status status = new Status(); status.setId(id); //不需要核实且非app上报案件，直接立案，则更新立案标准 - if (isNeedVerify == 0 ) { + if (isNeedVerify == 0) { status.setBzhours(bzhours);//限制完成总时限（小时） status.setBzminis(bzminis);//限制完成总时限（分） - }else { + } else { status.setBzhours(0);//限制完成总时限（小时）初始化 status.setBzminis(0);//限制完成总时限（分）初始化 } @@ -127,29 +128,37 @@ ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); processDetail.setReportTime(new Date());//上报时间 - if (isNeedVerify == 1 && verifyPersonId>0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） + if (isNeedVerify == 1 && verifyPersonId > 0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） processDetail.setVerifyPersonId(verifyPersonId);//核实人员id } //processDetail.setReportSupervisorId(shiroUser.getId());//上报人员id //processDetail.setReportSupervisorPhone(shiroUser.getPhone());//上报人员电话 processDetailService.insert(processDetail); - String processId=null; + String processId = null; //启动流程 - if(isNeedVerify==1) {//需要核实 + if (isNeedVerify == 1) {//需要核实 //待核实 - processId=caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(),String.valueOf(verifyPersonId),id+"" ); - }else {//不需要核实 + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(), String.valueOf(verifyPersonId), id + ""); + } else {//不需要核实 //待立案 - processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null,id+"" ); + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null, id + ""); } //更新case表的processId cwsCase.setProcessId(processId); updateById(cwsCase); - //不需要核实，调用流程处理接口进行立案操作 - if(isNeedVerify == 0 ){ + filingOperation(cwsCase, isNeedVerify, id, processId); + return true; + } + + /** + * 立案操作 + */ + private void filingOperation(CwsCase cwsCase, int isNeedVerify, Long id, String processId) { + //手动创建或者推送案件 如:视频监控,管网 等外接案件均不做自动立案处理 + if (isNeedVerify == 0 && SourceEnum.stateOf(cwsCase.getSource()).isAutoFiling()) { ProcessDcmsDto dto = new ProcessDcmsDto(); dto.setBizId(String.valueOf(id)); dto.setProcessId(processId); @@ -157,7 +166,6 @@ dto.setChangeState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); caseFlowService.completeCaseTask(dto); } - return true; } /** @@ -165,7 +173,7 @@ */ @Transactional @Override - public boolean createNewAPP(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId){ + public boolean createNewAPP(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId) { //更新CASE表 cwsCase.setCreateTime(new Date());//案卷录入时间 ShiroUser shiroUser = service.getCurrLoginUser(); @@ -175,9 +183,9 @@ cwsCase.setCaseState(CaseStateEnum.TO_BE_VERIFIED.getState()); } else { //快速上报 - if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()){ + if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()) { cwsCase.setCaseState(CaseStateEnum.TO_BE_CLOSED.getState()); - }else { + } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } } @@ -185,7 +193,7 @@ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); - caseid = todayDate + df.format(countCaseToday()+1); + caseid = todayDate + df.format(countCaseToday() + 1); cwsCase.setCaseid(caseid); insert(cwsCase); //往主表(CASE表)新增案卷 @@ -196,9 +204,9 @@ casedetail.setId(id); casedetail.setIsNeedRevisit(isNeedRevisit);//是否需要回访 casedetail.setIsNeedVerify(isNeedVerify);//是否需要核实 - if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()){//是否快速上报 + if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()) {//是否快速上报 casedetail.setIsquickReport(1); - }else { + } else { casedetail.setIsquickReport(0); } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 @@ -216,26 +224,26 @@ ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); processDetail.setReportTime(new Date());//上报时间 - if (isNeedVerify == 1 && verifyPersonId>0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） + if (isNeedVerify == 1 && verifyPersonId > 0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） processDetail.setVerifyPersonId(verifyPersonId);//核实人员id } processDetail.setReportSupervisorId(shiroUser.getId());//上报人员id processDetail.setReportSupervisorPhone(shiroUser.getPhone());//上报人员电话 processDetailService.insert(processDetail); - String processId=null; + String processId = null; //启动流程 - if(isNeedVerify==1) {//需要核实 + if (isNeedVerify == 1) {//需要核实 //待核实 - processId=caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(),String.valueOf(verifyPersonId),id+"" ); - }else {//不需要核实 + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(), String.valueOf(verifyPersonId), id + ""); + } else {//不需要核实 //快捷上报 - if(cwsCase.getSource()== SourceEnum.ENDREPORT_QUIK.getState()){ + if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()) { //待结案 - processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_CLOSED.getState(), null,id+"" ); - }else { + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_CLOSED.getState(), null, id + ""); + } else { //待立案 - processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null,id+"" ); + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null, id + ""); } } @@ -251,7 +259,7 @@ */ @Transactional @Override - public boolean createNewWeChat(CwsCase cwsCase,int isNeedRevisit){ + public boolean createNewWeChat(CwsCase cwsCase, int isNeedRevisit) { //更新CASE表 cwsCase.setCreateTime(new Date());//案卷录入时间 cwsCase.setDelFlag(new BigDecimal(0));//逻辑删除标志，0-否，1-是 @@ -262,7 +270,7 @@ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); - caseid = todayDate + df.format(countCaseToday()+1); + caseid = todayDate + df.format(countCaseToday() + 1); cwsCase.setCaseid(caseid); insert(cwsCase); //往主表(CASE表)新增案卷 @@ -293,11 +301,10 @@ processDetail.setReportTime(new Date());//上报时间 processDetailService.insert(processDetail); - String processId=null; + String processId = null; //启动流程 //待发送核实 - processId=caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_DISTRIBUTE_VERIFY.getState(),null,id+"" ); - + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_DISTRIBUTE_VERIFY.getState(), null, id + ""); //更新case表的processId cwsCase.setProcessId(processId); @@ -312,14 +319,13 @@ /** * 根据案卷状态查询，可添加是否延期、是否缓办条件 - * */ @Override - public List> queryByCondition(Page page, DataScope dataScope,QueryCondition queryCondition){ - List> results = this.baseMapper.queryByCondition(page,dataScope,queryCondition); + public List> queryByCondition(Page page, DataScope dataScope, QueryCondition queryCondition) { + List> results = this.baseMapper.queryByCondition(page, dataScope, queryCondition); - for (Map map:results) { - String createUserName=""; + for (Map map : results) { + String createUserName = ""; //大小类 map = warpper(map); @@ -327,9 +333,9 @@ //上报人员 if (!ToolUtil.isEmpty(map.get("createUser"))) { Long createUser = Long.valueOf(String.valueOf(map.get("createUser"))); - createUserName = service.getUserById(createUser,null).getName(); + createUserName = service.getUserById(createUser, null).getName(); } - map.put("createUserName",createUserName); + map.put("createUserName", createUserName); } return results; @@ -337,14 +343,14 @@ } @Override - public List> queryByCondition(DataScope dataScope,QueryCondition queryCondition){ - return this.baseMapper.queryByCondition(dataScope,queryCondition); + public List> queryByCondition(DataScope dataScope, QueryCondition queryCondition) { + return this.baseMapper.queryByCondition(dataScope, queryCondition); } @Override - public List> historyByPhone(Page page, String reporterPhone){ - List> results =this.baseMapper.historyByPhone(page,reporterPhone); - for (Map map:results) { + public List> historyByPhone(Page page, String reporterPhone) { + List> results = this.baseMapper.historyByPhone(page, reporterPhone); + for (Map map : results) { //大小类 map = warpper(map); } @@ -355,23 +361,22 @@ /** * 详情 - * */ @Override - public List> caseDetailById(Long id){ - List> results = this.baseMapper.caseDetailById(id); + public List> caseDetailById(Long id) { + List> results = this.baseMapper.caseDetailById(id); - for (Map map:results) { - String createUserName=""; - String verifyPersonName=""; - String checkPersonName=""; - String processPersonName=""; - String casetypesTimeName=""; - String areaName=""; - String streetName=""; - String communityName=""; - String reportSupervisorName=""; - String superviseUserName=""; + for (Map map : results) { + String createUserName = ""; + String verifyPersonName = ""; + String checkPersonName = ""; + String processPersonName = ""; + String casetypesTimeName = ""; + String areaName = ""; + String streetName = ""; + String communityName = ""; + String reportSupervisorName = ""; + String superviseUserName = ""; //大小类 map = warpper(map); @@ -379,34 +384,34 @@ //案卷录入人员 if (!ToolUtil.isEmpty(map.get("createUser"))) { Long createUser = Long.valueOf(String.valueOf(map.get("createUser"))); - createUserName = service.getUserById(createUser,null).getName(); + createUserName = service.getUserById(createUser, null).getName(); } //上报人员 if (!ToolUtil.isEmpty(map.get("reportSupervisorId"))) { Long reportSupervisorId = Long.valueOf(String.valueOf(map.get("reportSupervisorId"))); - reportSupervisorName = service.getUserById(reportSupervisorId,null).getName(); + reportSupervisorName = service.getUserById(reportSupervisorId, null).getName(); } //核实人员 if (!ToolUtil.isEmpty(map.get("verifyPersonId"))) { Long verifyPersonId = Long.valueOf(String.valueOf(map.get("verifyPersonId"))); - verifyPersonName = service.getUserById(verifyPersonId,null).getName(); + verifyPersonName = service.getUserById(verifyPersonId, null).getName(); } //核查人员 if (!ToolUtil.isEmpty(map.get("checkPersonId"))) { Long checkPersonId = Long.valueOf(String.valueOf(map.get("checkPersonId"))); - checkPersonName = service.getUserById(checkPersonId,null).getName(); + checkPersonName = service.getUserById(checkPersonId, null).getName(); } //处理人员 if (!ToolUtil.isEmpty(map.get("processPersonId"))) { Long processPersonId = Long.valueOf(String.valueOf(map.get("processPersonId"))); - processPersonName = service.getUserById(processPersonId,null).getName(); + processPersonName = service.getUserById(processPersonId, null).getName(); } //立案标准 @@ -419,90 +424,89 @@ if (!ToolUtil.isEmpty(map.get("areaCode"))) { Long areaId = Long.valueOf(map.get("areaCode").toString()); Area area = expandComponentService.getAreaById(areaId); - if(area!=null)areaName=area.getAreaName(); + if (area != null) areaName = area.getAreaName(); } //所属街道 if (!ToolUtil.isEmpty(map.get("streetCode"))) { Long areaId = Long.valueOf(map.get("streetCode").toString()); Area area = expandComponentService.getAreaById(areaId); - if(area!=null)streetName=area.getAreaName(); + if (area != null) streetName = area.getAreaName(); } //所属社区 if (!ToolUtil.isEmpty(map.get("communityCode"))) { Long areaId = Long.valueOf(map.get("communityCode").toString()); Area area = expandComponentService.getAreaById(areaId); - if(area!=null)communityName=area.getAreaName(); + if (area != null) communityName = area.getAreaName(); } //监督人员 if (!ToolUtil.isEmpty(map.get("superviseUserid"))) { Long superviseUserid = Long.valueOf(String.valueOf(map.get("superviseUserid"))); - superviseUserName = service.getUserById(superviseUserid,null).getName(); + superviseUserName = service.getUserById(superviseUserid, null).getName(); } - map.put("createUserName",createUserName); - map.put("verifyPersonName",verifyPersonName); - map.put("checkPersonName",checkPersonName); - map.put("processPersonName",processPersonName); - map.put("casetypesTimeName",casetypesTimeName); - map.put("areaName",areaName); - map.put("streetName",streetName); - map.put("communityName",communityName); - map.put("reportSupervisorName",reportSupervisorName); - map.put("superviseUserName",superviseUserName); + map.put("createUserName", createUserName); + map.put("verifyPersonName", verifyPersonName); + map.put("checkPersonName", checkPersonName); + map.put("processPersonName", processPersonName); + map.put("casetypesTimeName", casetypesTimeName); + map.put("areaName", areaName); + map.put("streetName", streetName); + map.put("communityName", communityName); + map.put("reportSupervisorName", reportSupervisorName); + map.put("superviseUserName", superviseUserName); } return results; } - @Override - public List> workList(Page page,String groupId,String onedeptid,String actUserId,QueryCondition queryCondition){ - List> results = this.baseMapper.workList(page,groupId,onedeptid,actUserId,queryCondition); - for (Map map:results) { + public List> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) { + List> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition); + for (Map map : results) { //大小类 map = warpper(map); } - return results; + return results; } @Override - public List> completedList(Page page,String actUserId, QueryCondition queryCondition){ - List> results = this.baseMapper.completedList(page,actUserId,queryCondition); - for (Map map:results) { + public List> completedList(Page page, String actUserId, QueryCondition queryCondition) { + List> results = this.baseMapper.completedList(page, actUserId, queryCondition); + for (Map map : results) { //大小类 map = warpper(map); } - return results; + return results; } //包装大小类 - private Map warpper(Map m){ - Map map =m; - String casetypeName=""; - String casetypeDetailName=""; - String eorc =""; + private Map warpper(Map m) { + Map map = m; + String casetypeName = ""; + String casetypeDetailName = ""; + String eorc = ""; - if(!ToolUtil.isEmpty(map.get("eorc"))) eorc=String.valueOf(map.get("eorc")); + if (!ToolUtil.isEmpty(map.get("eorc"))) eorc = String.valueOf(map.get("eorc")); //案卷大类 - CaseType caseType=null; + CaseType caseType = null; if (!ToolUtil.isEmpty(map.get("casetypeCode"))) { String casetypeCode = String.valueOf(map.get("casetypeCode")); caseType = casetypeService.selectByCode(eorc, casetypeCode); - if(caseType!=null)casetypeName = caseType.getTypeName(); + if (caseType != null) casetypeName = caseType.getTypeName(); } //案卷小类 - if (!ToolUtil.isEmpty(map.get("casetypeDetailCode")) && caseType!=null) { + if (!ToolUtil.isEmpty(map.get("casetypeDetailCode")) && caseType != null) { String typeId = String.valueOf(caseType.getId()); String casetypeDetailCode = String.valueOf(map.get("casetypeDetailCode")); CaseTypeDetail caseTypeDetail = null; caseTypeDetail = casetypeDetailService.selectByCode(eorc, typeId, casetypeDetailCode); - if(caseTypeDetail!=null)casetypeDetailName = caseTypeDetail.getTypeDetailName(); + if (caseTypeDetail != null) casetypeDetailName = caseTypeDetail.getTypeDetailName(); } map.put("casetypeName", casetypeName); map.put("casetypeDetailName", casetypeDetailName); diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java index 215f9c1..9ee0f95 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsCaseServiceImpl.java @@ -66,8 +66,9 @@ private IStatusService statusService; @Autowired private IProcessDetailService processDetailService; + @Override - public Integer countCaseToday(){ + public Integer countCaseToday() { return this.baseMapper.countCaseToday(); } @@ -77,7 +78,7 @@ */ @Transactional @Override - public boolean createNewPC(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId){ + public boolean createNewPC(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId) { //更新CASE表 //案卷录入时间 cwsCase.setCreateTime(new Date()); @@ -94,7 +95,7 @@ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); - caseid = todayDate + df.format(countCaseToday()+1); + caseid = todayDate + df.format(countCaseToday() + 1); cwsCase.setCaseid(caseid); insert(cwsCase); //往主表(CASE表)新增案卷 @@ -113,10 +114,10 @@ Status status = new Status(); status.setId(id); //不需要核实且非app上报案件，直接立案，则更新立案标准 - if (isNeedVerify == 0 ) { + if (isNeedVerify == 0) { status.setBzhours(bzhours);//限制完成总时限（小时） status.setBzminis(bzminis);//限制完成总时限（分） - }else { + } else { status.setBzhours(0);//限制完成总时限（小时）初始化 status.setBzminis(0);//限制完成总时限（分）初始化 } @@ -127,29 +128,37 @@ ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); processDetail.setReportTime(new Date());//上报时间 - if (isNeedVerify == 1 && verifyPersonId>0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） + if (isNeedVerify == 1 && verifyPersonId > 0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） processDetail.setVerifyPersonId(verifyPersonId);//核实人员id } //processDetail.setReportSupervisorId(shiroUser.getId());//上报人员id //processDetail.setReportSupervisorPhone(shiroUser.getPhone());//上报人员电话 processDetailService.insert(processDetail); - String processId=null; + String processId = null; //启动流程 - if(isNeedVerify==1) {//需要核实 + if (isNeedVerify == 1) {//需要核实 //待核实 - processId=caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(),String.valueOf(verifyPersonId),id+"" ); - }else {//不需要核实 + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(), String.valueOf(verifyPersonId), id + ""); + } else {//不需要核实 //待立案 - processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null,id+"" ); + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null, id + ""); } //更新case表的processId cwsCase.setProcessId(processId); updateById(cwsCase); - //不需要核实，调用流程处理接口进行立案操作 - if(isNeedVerify == 0 ){ + filingOperation(cwsCase, isNeedVerify, id, processId); + return true; + } + + /** + * 立案操作 + */ + private void filingOperation(CwsCase cwsCase, int isNeedVerify, Long id, String processId) { + //手动创建或者推送案件 如:视频监控,管网 等外接案件均不做自动立案处理 + if (isNeedVerify == 0 && SourceEnum.stateOf(cwsCase.getSource()).isAutoFiling()) { ProcessDcmsDto dto = new ProcessDcmsDto(); dto.setBizId(String.valueOf(id)); dto.setProcessId(processId); @@ -157,7 +166,6 @@ dto.setChangeState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); caseFlowService.completeCaseTask(dto); } - return true; } /** @@ -165,7 +173,7 @@ */ @Transactional @Override - public boolean createNewAPP(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId){ + public boolean createNewAPP(CwsCase cwsCase, int isNeedVerify, int isNeedRevisit, int bzhours, int bzminis, Long verifyPersonId) { //更新CASE表 cwsCase.setCreateTime(new Date());//案卷录入时间 ShiroUser shiroUser = service.getCurrLoginUser(); @@ -175,9 +183,9 @@ cwsCase.setCaseState(CaseStateEnum.TO_BE_VERIFIED.getState()); } else { //快速上报 - if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()){ + if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()) { cwsCase.setCaseState(CaseStateEnum.TO_BE_CLOSED.getState()); - }else { + } else { cwsCase.setCaseState(CaseStateEnum.TO_BE_REGISTERED.getState()); } } @@ -185,7 +193,7 @@ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); - caseid = todayDate + df.format(countCaseToday()+1); + caseid = todayDate + df.format(countCaseToday() + 1); cwsCase.setCaseid(caseid); insert(cwsCase); //往主表(CASE表)新增案卷 @@ -196,9 +204,9 @@ casedetail.setId(id); casedetail.setIsNeedRevisit(isNeedRevisit);//是否需要回访 casedetail.setIsNeedVerify(isNeedVerify);//是否需要核实 - if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()){//是否快速上报 + if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()) {//是否快速上报 casedetail.setIsquickReport(1); - }else { + } else { casedetail.setIsquickReport(0); } casedetailService.insert(casedetail);//往CASEDETAIL表新增案卷 @@ -216,26 +224,26 @@ ProcessDetail processDetail = new ProcessDetail(); processDetail.setId(id); processDetail.setReportTime(new Date());//上报时间 - if (isNeedVerify == 1 && verifyPersonId>0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） + if (isNeedVerify == 1 && verifyPersonId > 0) {//需要核实且指定了核实人员，则更新verifyPersonId字段。（微信公众号来的案件需要核实，但没有指定核实人员） processDetail.setVerifyPersonId(verifyPersonId);//核实人员id } processDetail.setReportSupervisorId(shiroUser.getId());//上报人员id processDetail.setReportSupervisorPhone(shiroUser.getPhone());//上报人员电话 processDetailService.insert(processDetail); - String processId=null; + String processId = null; //启动流程 - if(isNeedVerify==1) {//需要核实 + if (isNeedVerify == 1) {//需要核实 //待核实 - processId=caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(),String.valueOf(verifyPersonId),id+"" ); - }else {//不需要核实 + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_VERIFIED.getState(), String.valueOf(verifyPersonId), id + ""); + } else {//不需要核实 //快捷上报 - if(cwsCase.getSource()== SourceEnum.ENDREPORT_QUIK.getState()){ + if (cwsCase.getSource() == SourceEnum.ENDREPORT_QUIK.getState()) { //待结案 - processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_CLOSED.getState(), null,id+"" ); - }else { + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_CLOSED.getState(), null, id + ""); + } else { //待立案 - processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null,id+"" ); + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_BE_REGISTERED.getState(), null, id + ""); } } @@ -251,7 +259,7 @@ */ @Transactional @Override - public boolean createNewWeChat(CwsCase cwsCase,int isNeedRevisit){ + public boolean createNewWeChat(CwsCase cwsCase, int isNeedRevisit) { //更新CASE表 cwsCase.setCreateTime(new Date());//案卷录入时间 cwsCase.setDelFlag(new BigDecimal(0));//逻辑删除标志，0-否，1-是 @@ -262,7 +270,7 @@ SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd"); String todayDate = formatter.format(new Date()); DecimalFormat df = new DecimalFormat("0000"); - caseid = todayDate + df.format(countCaseToday()+1); + caseid = todayDate + df.format(countCaseToday() + 1); cwsCase.setCaseid(caseid); insert(cwsCase); //往主表(CASE表)新增案卷 @@ -293,11 +301,10 @@ processDetail.setReportTime(new Date());//上报时间 processDetailService.insert(processDetail); - String processId=null; + String processId = null; //启动流程 //待发送核实 - processId=caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_DISTRIBUTE_VERIFY.getState(),null,id+"" ); - + processId = caseFlowService.startCaseFlow(cwsCase.getSource(), CaseStateEnum.TO_DISTRIBUTE_VERIFY.getState(), null, id + ""); //更新case表的processId cwsCase.setProcessId(processId); @@ -312,14 +319,13 @@ /** * 根据案卷状态查询，可添加是否延期、是否缓办条件 - * */ @Override - public List> queryByCondition(Page page, DataScope dataScope,QueryCondition queryCondition){ - List> results = this.baseMapper.queryByCondition(page,dataScope,queryCondition); + public List> queryByCondition(Page page, DataScope dataScope, QueryCondition queryCondition) { + List> results = this.baseMapper.queryByCondition(page, dataScope, queryCondition); - for (Map map:results) { - String createUserName=""; + for (Map map : results) { + String createUserName = ""; //大小类 map = warpper(map); @@ -327,9 +333,9 @@ //上报人员 if (!ToolUtil.isEmpty(map.get("createUser"))) { Long createUser = Long.valueOf(String.valueOf(map.get("createUser"))); - createUserName = service.getUserById(createUser,null).getName(); + createUserName = service.getUserById(createUser, null).getName(); } - map.put("createUserName",createUserName); + map.put("createUserName", createUserName); } return results; @@ -337,14 +343,14 @@ } @Override - public List> queryByCondition(DataScope dataScope,QueryCondition queryCondition){ - return this.baseMapper.queryByCondition(dataScope,queryCondition); + public List> queryByCondition(DataScope dataScope, QueryCondition queryCondition) { + return this.baseMapper.queryByCondition(dataScope, queryCondition); } @Override - public List> historyByPhone(Page page, String reporterPhone){ - List> results =this.baseMapper.historyByPhone(page,reporterPhone); - for (Map map:results) { + public List> historyByPhone(Page page, String reporterPhone) { + List> results = this.baseMapper.historyByPhone(page, reporterPhone); + for (Map map : results) { //大小类 map = warpper(map); } @@ -355,23 +361,22 @@ /** * 详情 - * */ @Override - public List> caseDetailById(Long id){ - List> results = this.baseMapper.caseDetailById(id); + public List> caseDetailById(Long id) { + List> results = this.baseMapper.caseDetailById(id); - for (Map map:results) { - String createUserName=""; - String verifyPersonName=""; - String checkPersonName=""; - String processPersonName=""; - String casetypesTimeName=""; - String areaName=""; - String streetName=""; - String communityName=""; - String reportSupervisorName=""; - String superviseUserName=""; + for (Map map : results) { + String createUserName = ""; + String verifyPersonName = ""; + String checkPersonName = ""; + String processPersonName = ""; + String casetypesTimeName = ""; + String areaName = ""; + String streetName = ""; + String communityName = ""; + String reportSupervisorName = ""; + String superviseUserName = ""; //大小类 map = warpper(map); @@ -379,34 +384,34 @@ //案卷录入人员 if (!ToolUtil.isEmpty(map.get("createUser"))) { Long createUser = Long.valueOf(String.valueOf(map.get("createUser"))); - createUserName = service.getUserById(createUser,null).getName(); + createUserName = service.getUserById(createUser, null).getName(); } //上报人员 if (!ToolUtil.isEmpty(map.get("reportSupervisorId"))) { Long reportSupervisorId = Long.valueOf(String.valueOf(map.get("reportSupervisorId"))); - reportSupervisorName = service.getUserById(reportSupervisorId,null).getName(); + reportSupervisorName = service.getUserById(reportSupervisorId, null).getName(); } //核实人员 if (!ToolUtil.isEmpty(map.get("verifyPersonId"))) { Long verifyPersonId = Long.valueOf(String.valueOf(map.get("verifyPersonId"))); - verifyPersonName = service.getUserById(verifyPersonId,null).getName(); + verifyPersonName = service.getUserById(verifyPersonId, null).getName(); } //核查人员 if (!ToolUtil.isEmpty(map.get("checkPersonId"))) { Long checkPersonId = Long.valueOf(String.valueOf(map.get("checkPersonId"))); - checkPersonName = service.getUserById(checkPersonId,null).getName(); + checkPersonName = service.getUserById(checkPersonId, null).getName(); } //处理人员 if (!ToolUtil.isEmpty(map.get("processPersonId"))) { Long processPersonId = Long.valueOf(String.valueOf(map.get("processPersonId"))); - processPersonName = service.getUserById(processPersonId,null).getName(); + processPersonName = service.getUserById(processPersonId, null).getName(); } //立案标准 @@ -419,90 +424,89 @@ if (!ToolUtil.isEmpty(map.get("areaCode"))) { Long areaId = Long.valueOf(map.get("areaCode").toString()); Area area = expandComponentService.getAreaById(areaId); - if(area!=null)areaName=area.getAreaName(); + if (area != null) areaName = area.getAreaName(); } //所属街道 if (!ToolUtil.isEmpty(map.get("streetCode"))) { Long areaId = Long.valueOf(map.get("streetCode").toString()); Area area = expandComponentService.getAreaById(areaId); - if(area!=null)streetName=area.getAreaName(); + if (area != null) streetName = area.getAreaName(); } //所属社区 if (!ToolUtil.isEmpty(map.get("communityCode"))) { Long areaId = Long.valueOf(map.get("communityCode").toString()); Area area = expandComponentService.getAreaById(areaId); - if(area!=null)communityName=area.getAreaName(); + if (area != null) communityName = area.getAreaName(); } //监督人员 if (!ToolUtil.isEmpty(map.get("superviseUserid"))) { Long superviseUserid = Long.valueOf(String.valueOf(map.get("superviseUserid"))); - superviseUserName = service.getUserById(superviseUserid,null).getName(); + superviseUserName = service.getUserById(superviseUserid, null).getName(); } - map.put("createUserName",createUserName); - map.put("verifyPersonName",verifyPersonName); - map.put("checkPersonName",checkPersonName); - map.put("processPersonName",processPersonName); - map.put("casetypesTimeName",casetypesTimeName); - map.put("areaName",areaName); - map.put("streetName",streetName); - map.put("communityName",communityName); - map.put("reportSupervisorName",reportSupervisorName); - map.put("superviseUserName",superviseUserName); + map.put("createUserName", createUserName); + map.put("verifyPersonName", verifyPersonName); + map.put("checkPersonName", checkPersonName); + map.put("processPersonName", processPersonName); + map.put("casetypesTimeName", casetypesTimeName); + map.put("areaName", areaName); + map.put("streetName", streetName); + map.put("communityName", communityName); + map.put("reportSupervisorName", reportSupervisorName); + map.put("superviseUserName", superviseUserName); } return results; } - @Override - public List> workList(Page page,String groupId,String onedeptid,String actUserId,QueryCondition queryCondition){ - List> results = this.baseMapper.workList(page,groupId,onedeptid,actUserId,queryCondition); - for (Map map:results) { + public List> workList(Page page, String groupId, String onedeptid, String actUserId, QueryCondition queryCondition) { + List> results = this.baseMapper.workList(page, groupId, onedeptid, actUserId, queryCondition); + for (Map map : results) { //大小类 map = warpper(map); } - return results; + return results; } @Override - public List> completedList(Page page,String actUserId, QueryCondition queryCondition){ - List> results = this.baseMapper.completedList(page,actUserId,queryCondition); - for (Map map:results) { + public List> completedList(Page page, String actUserId, QueryCondition queryCondition) { + List> results = this.baseMapper.completedList(page, actUserId, queryCondition); + for (Map map : results) { //大小类 map = warpper(map); } - return results; + return results; } //包装大小类 - private Map warpper(Map m){ - Map map =m; - String casetypeName=""; - String casetypeDetailName=""; - String eorc =""; + private Map warpper(Map m) { + Map map = m; + String casetypeName = ""; + String casetypeDetailName = ""; + String eorc = ""; - if(!ToolUtil.isEmpty(map.get("eorc"))) eorc=String.valueOf(map.get("eorc")); + if (!ToolUtil.isEmpty(map.get("eorc"))) eorc = String.valueOf(map.get("eorc")); //案卷大类 - CaseType caseType=null; + CaseType caseType = null; if (!ToolUtil.isEmpty(map.get("casetypeCode"))) { String casetypeCode = String.valueOf(map.get("casetypeCode")); caseType = casetypeService.selectByCode(eorc, casetypeCode); - if(caseType!=null)casetypeName = caseType.getTypeName(); + if (caseType != null) casetypeName = caseType.getTypeName(); } //案卷小类 - if (!ToolUtil.isEmpty(map.get("casetypeDetailCode")) && caseType!=null) { + if (!ToolUtil.isEmpty(map.get("casetypeDetailCode")) && caseType != null) { String typeId = String.valueOf(caseType.getId()); String casetypeDetailCode = String.valueOf(map.get("casetypeDetailCode")); CaseTypeDetail caseTypeDetail = null; caseTypeDetail = casetypeDetailService.selectByCode(eorc, typeId, casetypeDetailCode); - if(caseTypeDetail!=null)casetypeDetailName = caseTypeDetail.getTypeDetailName(); + if (caseTypeDetail != null) casetypeDetailName = caseTypeDetail.getTypeDetailName(); } map.put("casetypeName", casetypeName); map.put("casetypeDetailName", casetypeDetailName); diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java index 93cb1a8..e894550 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/enums/SourceEnum.java @@ -1,22 +1,43 @@ package com.casic.missiles.modular.enums; +/** + * 案件来源枚举 + */ public enum SourceEnum { - HOTLINE(11, "热线电话"), - SMART_PIPE_NETWORK(3, "智慧管网"), - ENDREPORT_NORMAL(2, "终端-普通上报"), - WECHAT(12, "微信公众号"), - ENDREPORT_QUIK(1, "终端-快捷上报"), - VIDEO_MONITOR(14, "视频监控"), - SEDIMENT_TRUCK_MANAGE(15, "渣土车辆管理"), - COMMISSIONED_BY_LEADER(16, "领导委办"), - PIP(13, "智慧管网"); + HOTLINE(11, "热线电话", true), + SMART_PIPE_NETWORK(13, "智慧管网", false), + ENDREPORT_NORMAL(2, "终端-普通上报", false), + WECHAT(12, "微信公众号", false), + ENDREPORT_QUIK(1, "终端-快捷上报", false), + VIDEO_MONITOR(14, "视频监控", false), + SEDIMENT_TRUCK_MANAGE(15, "渣土车辆管理", false), + COMMISSIONED_BY_LEADER(16, "领导委办", true); + /** + * 案件来源 + */ private int state; + /** + * 案件来源名称 + */ private String stateName; + /** + * 是否自动立案 + */ + private boolean autoFiling; - SourceEnum(int state, String stateName) { + SourceEnum(int state, String stateName, boolean autoFiling) { this.state = state; this.stateName = stateName; + this.autoFiling = autoFiling; + } + + public boolean isAutoFiling() { + return autoFiling; + } + + public void setAutoFiling(boolean autoFiling) { + this.autoFiling = autoFiling; } public int getState() {