diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java index c6dadbb..2d8d20b 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java @@ -40,5 +40,11 @@ private String eorc; + public CaseSourceDTO() { + } + public CaseSourceDTO(String caseSource, String caseCode) { + this.caseSource = caseSource; + this.caseCode = caseCode; + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java index c6dadbb..2d8d20b 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java @@ -40,5 +40,11 @@ private String eorc; + public CaseSourceDTO() { + } + public CaseSourceDTO(String caseSource, String caseCode) { + this.caseSource = caseSource; + this.caseCode = caseCode; + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index 704398e..d77606d 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -2,11 +2,14 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import com.casic.missiles.modular.assess.service.IDepartmentAssessService; +import com.casic.missiles.modular.system.model.Dict; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.NumberFormat; @@ -30,6 +33,9 @@ private static String[] checkStateArr = {"1", "2"};//1,处置中,2处置完成 private static String[] delayStateArr = {"1", "2"};//1,超时,2未超时 + @Autowired + private ICommonPermissionService permissionService; + public String numberFormat(float floatNum) { NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); @@ -48,32 +54,32 @@ if ("lastCheckNum".equals(caseType)) { caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId); } else if ("currentCheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId); } else if ("checkedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId); } else if ("delayCheckedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId); } else if ("delayUncheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId); } else if ("redoNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId); + caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId); } - for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){ + for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())? - sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-"); + caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ? + sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-"); } catch (ParseException e) { e.printStackTrace(); } - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){ + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) { caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) { caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName()); break; } @@ -294,10 +300,10 @@ @Override public List highCaseEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); - List highEventDTOList = this.baseMapper.highCaseEventList(beg,end); - for(HighEventDTO highEventDTO:highEventDTOList){ - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + List highEventDTOList = this.baseMapper.highCaseEventList(beg, end); + for (HighEventDTO highEventDTO : highEventDTOList) { + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } @@ -310,26 +316,26 @@ public List highEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList(); - List highEventDTOList = this.baseMapper.highEventList(beg,end); + List highEventDTOList = this.baseMapper.highEventList(beg, end); HighEventDTO highEventTotalDTO = new HighEventDTO(); highEventTotalDTO.setEorc("合计"); highEventTotalDTO.setCaseType("-/-"); - long totalSum=0; - for(HighEventDTO highEventDTO:highEventDTOList){ - totalSum=totalSum+highEventDTO.getCaseNum(); - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + long totalSum = 0; + for (HighEventDTO highEventDTO : highEventDTOList) { + totalSum = totalSum + highEventDTO.getCaseNum(); + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) { highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName()); break; } } - highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType()); + highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType()); } highEventTotalDTO.setCaseNum(totalSum); highEventDTOList.add(highEventTotalDTO); @@ -338,28 +344,33 @@ @Override public List sourceList(String beg, String end) { - List sourceDictList=this.baseMapper.sourceDictList(); - List sourceList=this.baseMapper.sourceList(beg,end); + List dictList = permissionService.findInDictByCode("caseSource"); + List sourceDictList = new ArrayList<>(); + for (Dict dict : dictList) { + sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode())); + } +// List sourceDictList = this.baseMapper.sourceDictList(); + List sourceList = this.baseMapper.sourceList(beg, end); CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO(); caseSourceTotalDTO.setCaseSource("--"); - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - for(CaseSourceDTO sourceDTO:sourceList){ - if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){ - if("1".equals(sourceDTO.getEorc())){ + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + for (CaseSourceDTO sourceDTO : sourceList) { + if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) { + if ("1".equals(sourceDTO.getEorc())) { caseSourceDTO.setEventNum(sourceDTO.getCaseNum()); - }else if("2".equals(sourceDTO.getEorc())){ + } else if ("2".equals(sourceDTO.getEorc())) { caseSourceDTO.setComponentNum(sourceDTO.getCaseNum()); } } } } - long caseNumSum=0,componentNumSum=0,eventNumSum=0; - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum()); - caseNumSum=caseNumSum+caseSourceDTO.getCaseNum(); - componentNumSum=componentNumSum+caseSourceDTO.getComponentNum(); - eventNumSum=eventNumSum+caseSourceDTO.getEventNum(); + long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0; + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum()); + caseNumSum = caseNumSum + caseSourceDTO.getCaseNum(); + componentNumSum = componentNumSum + caseSourceDTO.getComponentNum(); + eventNumSum = eventNumSum + caseSourceDTO.getEventNum(); } caseSourceTotalDTO.setCaseNum(caseNumSum); caseSourceTotalDTO.setComponentNum(componentNumSum); diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java index c6dadbb..2d8d20b 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java @@ -40,5 +40,11 @@ private String eorc; + public CaseSourceDTO() { + } + public CaseSourceDTO(String caseSource, String caseCode) { + this.caseSource = caseSource; + this.caseCode = caseCode; + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index 704398e..d77606d 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -2,11 +2,14 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import com.casic.missiles.modular.assess.service.IDepartmentAssessService; +import com.casic.missiles.modular.system.model.Dict; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.NumberFormat; @@ -30,6 +33,9 @@ private static String[] checkStateArr = {"1", "2"};//1,处置中,2处置完成 private static String[] delayStateArr = {"1", "2"};//1,超时,2未超时 + @Autowired + private ICommonPermissionService permissionService; + public String numberFormat(float floatNum) { NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); @@ -48,32 +54,32 @@ if ("lastCheckNum".equals(caseType)) { caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId); } else if ("currentCheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId); } else if ("checkedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId); } else if ("delayCheckedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId); } else if ("delayUncheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId); } else if ("redoNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId); + caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId); } - for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){ + for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())? - sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-"); + caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ? + sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-"); } catch (ParseException e) { e.printStackTrace(); } - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){ + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) { caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) { caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName()); break; } @@ -294,10 +300,10 @@ @Override public List highCaseEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); - List highEventDTOList = this.baseMapper.highCaseEventList(beg,end); - for(HighEventDTO highEventDTO:highEventDTOList){ - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + List highEventDTOList = this.baseMapper.highCaseEventList(beg, end); + for (HighEventDTO highEventDTO : highEventDTOList) { + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } @@ -310,26 +316,26 @@ public List highEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList(); - List highEventDTOList = this.baseMapper.highEventList(beg,end); + List highEventDTOList = this.baseMapper.highEventList(beg, end); HighEventDTO highEventTotalDTO = new HighEventDTO(); highEventTotalDTO.setEorc("合计"); highEventTotalDTO.setCaseType("-/-"); - long totalSum=0; - for(HighEventDTO highEventDTO:highEventDTOList){ - totalSum=totalSum+highEventDTO.getCaseNum(); - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + long totalSum = 0; + for (HighEventDTO highEventDTO : highEventDTOList) { + totalSum = totalSum + highEventDTO.getCaseNum(); + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) { highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName()); break; } } - highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType()); + highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType()); } highEventTotalDTO.setCaseNum(totalSum); highEventDTOList.add(highEventTotalDTO); @@ -338,28 +344,33 @@ @Override public List sourceList(String beg, String end) { - List sourceDictList=this.baseMapper.sourceDictList(); - List sourceList=this.baseMapper.sourceList(beg,end); + List dictList = permissionService.findInDictByCode("caseSource"); + List sourceDictList = new ArrayList<>(); + for (Dict dict : dictList) { + sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode())); + } +// List sourceDictList = this.baseMapper.sourceDictList(); + List sourceList = this.baseMapper.sourceList(beg, end); CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO(); caseSourceTotalDTO.setCaseSource("--"); - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - for(CaseSourceDTO sourceDTO:sourceList){ - if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){ - if("1".equals(sourceDTO.getEorc())){ + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + for (CaseSourceDTO sourceDTO : sourceList) { + if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) { + if ("1".equals(sourceDTO.getEorc())) { caseSourceDTO.setEventNum(sourceDTO.getCaseNum()); - }else if("2".equals(sourceDTO.getEorc())){ + } else if ("2".equals(sourceDTO.getEorc())) { caseSourceDTO.setComponentNum(sourceDTO.getCaseNum()); } } } } - long caseNumSum=0,componentNumSum=0,eventNumSum=0; - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum()); - caseNumSum=caseNumSum+caseSourceDTO.getCaseNum(); - componentNumSum=componentNumSum+caseSourceDTO.getComponentNum(); - eventNumSum=eventNumSum+caseSourceDTO.getEventNum(); + long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0; + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum()); + caseNumSum = caseNumSum + caseSourceDTO.getCaseNum(); + componentNumSum = componentNumSum + caseSourceDTO.getComponentNum(); + eventNumSum = eventNumSum + caseSourceDTO.getEventNum(); } caseSourceTotalDTO.setCaseNum(caseNumSum); caseSourceTotalDTO.setComponentNum(componentNumSum); 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 9ee0f95..a650580 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 @@ -165,6 +165,10 @@ dto.setCurrState(CaseStateEnum.TO_BE_REGISTERED.getState()); dto.setChangeState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); caseFlowService.completeCaseTask(dto); + //后台直接派发,前端直接到处置环节 + dto.setCurrState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); + dto.setChangeState(CaseStateEnum.TO_BE_HANDLED.getState()); + caseFlowService.completeCaseTask(dto); } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java index c6dadbb..2d8d20b 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java @@ -40,5 +40,11 @@ private String eorc; + public CaseSourceDTO() { + } + public CaseSourceDTO(String caseSource, String caseCode) { + this.caseSource = caseSource; + this.caseCode = caseCode; + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index 704398e..d77606d 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -2,11 +2,14 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import com.casic.missiles.modular.assess.service.IDepartmentAssessService; +import com.casic.missiles.modular.system.model.Dict; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.NumberFormat; @@ -30,6 +33,9 @@ private static String[] checkStateArr = {"1", "2"};//1,处置中,2处置完成 private static String[] delayStateArr = {"1", "2"};//1,超时,2未超时 + @Autowired + private ICommonPermissionService permissionService; + public String numberFormat(float floatNum) { NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); @@ -48,32 +54,32 @@ if ("lastCheckNum".equals(caseType)) { caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId); } else if ("currentCheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId); } else if ("checkedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId); } else if ("delayCheckedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId); } else if ("delayUncheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId); } else if ("redoNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId); + caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId); } - for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){ + for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())? - sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-"); + caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ? + sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-"); } catch (ParseException e) { e.printStackTrace(); } - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){ + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) { caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) { caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName()); break; } @@ -294,10 +300,10 @@ @Override public List highCaseEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); - List highEventDTOList = this.baseMapper.highCaseEventList(beg,end); - for(HighEventDTO highEventDTO:highEventDTOList){ - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + List highEventDTOList = this.baseMapper.highCaseEventList(beg, end); + for (HighEventDTO highEventDTO : highEventDTOList) { + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } @@ -310,26 +316,26 @@ public List highEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList(); - List highEventDTOList = this.baseMapper.highEventList(beg,end); + List highEventDTOList = this.baseMapper.highEventList(beg, end); HighEventDTO highEventTotalDTO = new HighEventDTO(); highEventTotalDTO.setEorc("合计"); highEventTotalDTO.setCaseType("-/-"); - long totalSum=0; - for(HighEventDTO highEventDTO:highEventDTOList){ - totalSum=totalSum+highEventDTO.getCaseNum(); - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + long totalSum = 0; + for (HighEventDTO highEventDTO : highEventDTOList) { + totalSum = totalSum + highEventDTO.getCaseNum(); + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) { highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName()); break; } } - highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType()); + highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType()); } highEventTotalDTO.setCaseNum(totalSum); highEventDTOList.add(highEventTotalDTO); @@ -338,28 +344,33 @@ @Override public List sourceList(String beg, String end) { - List sourceDictList=this.baseMapper.sourceDictList(); - List sourceList=this.baseMapper.sourceList(beg,end); + List dictList = permissionService.findInDictByCode("caseSource"); + List sourceDictList = new ArrayList<>(); + for (Dict dict : dictList) { + sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode())); + } +// List sourceDictList = this.baseMapper.sourceDictList(); + List sourceList = this.baseMapper.sourceList(beg, end); CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO(); caseSourceTotalDTO.setCaseSource("--"); - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - for(CaseSourceDTO sourceDTO:sourceList){ - if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){ - if("1".equals(sourceDTO.getEorc())){ + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + for (CaseSourceDTO sourceDTO : sourceList) { + if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) { + if ("1".equals(sourceDTO.getEorc())) { caseSourceDTO.setEventNum(sourceDTO.getCaseNum()); - }else if("2".equals(sourceDTO.getEorc())){ + } else if ("2".equals(sourceDTO.getEorc())) { caseSourceDTO.setComponentNum(sourceDTO.getCaseNum()); } } } } - long caseNumSum=0,componentNumSum=0,eventNumSum=0; - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum()); - caseNumSum=caseNumSum+caseSourceDTO.getCaseNum(); - componentNumSum=componentNumSum+caseSourceDTO.getComponentNum(); - eventNumSum=eventNumSum+caseSourceDTO.getEventNum(); + long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0; + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum()); + caseNumSum = caseNumSum + caseSourceDTO.getCaseNum(); + componentNumSum = componentNumSum + caseSourceDTO.getComponentNum(); + eventNumSum = eventNumSum + caseSourceDTO.getEventNum(); } caseSourceTotalDTO.setCaseNum(caseNumSum); caseSourceTotalDTO.setComponentNum(componentNumSum); 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 9ee0f95..a650580 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 @@ -165,6 +165,10 @@ dto.setCurrState(CaseStateEnum.TO_BE_REGISTERED.getState()); dto.setChangeState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); caseFlowService.completeCaseTask(dto); + //后台直接派发,前端直接到处置环节 + dto.setCurrState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); + dto.setChangeState(CaseStateEnum.TO_BE_HANDLED.getState()); + caseFlowService.completeCaseTask(dto); } } diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index fc0b1d4..3d9ac58 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.dto.ProcessRecord; +import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.CwsRoleEnums; import com.casic.missiles.modular.flowable.constant.FlowConstants; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; @@ -95,6 +96,13 @@ return ResponseData.error("该案件已处理,请及时刷新页面"); } caseFlowService.completeCaseTask(dto); + + //若是立案派发在后台直接完成,前端直接到处置部门 + if (CaseStateEnum.TO_BE_DISTRIBUTED.getState() == dto.getChangeState()) { + dto.setCurrState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); + dto.setChangeState(CaseStateEnum.TO_BE_HANDLED.getState()); + caseFlowService.completeCaseTask(dto); + } return ResponseData.success(); } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java index c6dadbb..2d8d20b 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java @@ -40,5 +40,11 @@ private String eorc; + public CaseSourceDTO() { + } + public CaseSourceDTO(String caseSource, String caseCode) { + this.caseSource = caseSource; + this.caseCode = caseCode; + } } diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java index 704398e..d77606d 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java @@ -2,11 +2,14 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.model.DepartmentAssessFactor; import com.casic.missiles.modular.assess.service.IDepartmentAssessService; +import com.casic.missiles.modular.system.model.Dict; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.NumberFormat; @@ -30,6 +33,9 @@ private static String[] checkStateArr = {"1", "2"};//1,处置中,2处置完成 private static String[] delayStateArr = {"1", "2"};//1,超时,2未超时 + @Autowired + private ICommonPermissionService permissionService; + public String numberFormat(float floatNum) { NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); @@ -48,32 +54,32 @@ if ("lastCheckNum".equals(caseType)) { caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId); } else if ("currentCheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId); } else if ("checkedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId); } else if ("delayCheckedNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId); } else if ("delayUncheckNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId); + caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId); } else if ("redoNum".equals(caseType)) { - caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId); + caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId); } - for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){ + for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { - caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())? - sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-"); + caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ? + sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-"); } catch (ParseException e) { e.printStackTrace(); } - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){ + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) { caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) { caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName()); break; } @@ -294,10 +300,10 @@ @Override public List highCaseEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); - List highEventDTOList = this.baseMapper.highCaseEventList(beg,end); - for(HighEventDTO highEventDTO:highEventDTOList){ - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + List highEventDTOList = this.baseMapper.highCaseEventList(beg, end); + for (HighEventDTO highEventDTO : highEventDTOList) { + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } @@ -310,26 +316,26 @@ public List highEventList(String beg, String end) { List caseTypeDTOList = this.baseMapper.caseTypeList(); List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList(); - List highEventDTOList = this.baseMapper.highEventList(beg,end); + List highEventDTOList = this.baseMapper.highEventList(beg, end); HighEventDTO highEventTotalDTO = new HighEventDTO(); highEventTotalDTO.setEorc("合计"); highEventTotalDTO.setCaseType("-/-"); - long totalSum=0; - for(HighEventDTO highEventDTO:highEventDTOList){ - totalSum=totalSum+highEventDTO.getCaseNum(); - for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){ - if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){ + long totalSum = 0; + for (HighEventDTO highEventDTO : highEventDTOList) { + totalSum = totalSum + highEventDTO.getCaseNum(); + for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) { + if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) { highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName()); break; } } - for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){ - if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){ + for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) { + if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) { highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName()); break; } } - highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType()); + highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType()); } highEventTotalDTO.setCaseNum(totalSum); highEventDTOList.add(highEventTotalDTO); @@ -338,28 +344,33 @@ @Override public List sourceList(String beg, String end) { - List sourceDictList=this.baseMapper.sourceDictList(); - List sourceList=this.baseMapper.sourceList(beg,end); + List dictList = permissionService.findInDictByCode("caseSource"); + List sourceDictList = new ArrayList<>(); + for (Dict dict : dictList) { + sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode())); + } +// List sourceDictList = this.baseMapper.sourceDictList(); + List sourceList = this.baseMapper.sourceList(beg, end); CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO(); caseSourceTotalDTO.setCaseSource("--"); - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - for(CaseSourceDTO sourceDTO:sourceList){ - if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){ - if("1".equals(sourceDTO.getEorc())){ + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + for (CaseSourceDTO sourceDTO : sourceList) { + if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) { + if ("1".equals(sourceDTO.getEorc())) { caseSourceDTO.setEventNum(sourceDTO.getCaseNum()); - }else if("2".equals(sourceDTO.getEorc())){ + } else if ("2".equals(sourceDTO.getEorc())) { caseSourceDTO.setComponentNum(sourceDTO.getCaseNum()); } } } } - long caseNumSum=0,componentNumSum=0,eventNumSum=0; - for(CaseSourceDTO caseSourceDTO:sourceDictList){ - caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum()); - caseNumSum=caseNumSum+caseSourceDTO.getCaseNum(); - componentNumSum=componentNumSum+caseSourceDTO.getComponentNum(); - eventNumSum=eventNumSum+caseSourceDTO.getEventNum(); + long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0; + for (CaseSourceDTO caseSourceDTO : sourceDictList) { + caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum()); + caseNumSum = caseNumSum + caseSourceDTO.getCaseNum(); + componentNumSum = componentNumSum + caseSourceDTO.getComponentNum(); + eventNumSum = eventNumSum + caseSourceDTO.getEventNum(); } caseSourceTotalDTO.setCaseNum(caseNumSum); caseSourceTotalDTO.setComponentNum(componentNumSum); 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 9ee0f95..a650580 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 @@ -165,6 +165,10 @@ dto.setCurrState(CaseStateEnum.TO_BE_REGISTERED.getState()); dto.setChangeState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); caseFlowService.completeCaseTask(dto); + //后台直接派发,前端直接到处置环节 + dto.setCurrState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); + dto.setChangeState(CaseStateEnum.TO_BE_HANDLED.getState()); + caseFlowService.completeCaseTask(dto); } } diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index fc0b1d4..3d9ac58 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -9,6 +9,7 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.dto.ProcessRecord; +import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.CwsRoleEnums; import com.casic.missiles.modular.flowable.constant.FlowConstants; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; @@ -95,6 +96,13 @@ return ResponseData.error("该案件已处理,请及时刷新页面"); } caseFlowService.completeCaseTask(dto); + + //若是立案派发在后台直接完成,前端直接到处置部门 + if (CaseStateEnum.TO_BE_DISTRIBUTED.getState() == dto.getChangeState()) { + dto.setCurrState(CaseStateEnum.TO_BE_DISTRIBUTED.getState()); + dto.setChangeState(CaseStateEnum.TO_BE_HANDLED.getState()); + caseFlowService.completeCaseTask(dto); + } return ResponseData.success(); } diff --git a/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn b/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn new file mode 100644 index 0000000..a8e7195 --- /dev/null +++ b/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn @@ -0,0 +1,912 @@ + + + + + + + + + + + usertask1 + usertask4 + usertask22 + inclusivegateway1 + + + usertask2 + usertask3 + usertask5 + usertask6 + usertask21 + usertask23 + exclusivegateway1 + usertask27 + + + usertask7 + usertask8 + usertask9 + usertask10 + usertask11 + usertask20 + usertask26 + inclusivegateway3 + + + usertask12 + usertask14 + usertask15 + usertask16 + usertask18 + inclusivegateway2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =10}]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +