diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java index 6147964..1a6d680 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/controller/AssessController.java @@ -2,13 +2,15 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.casic.missiles.core.base.controller.BaseController; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.ExportController; -import com.casic.missiles.core.common.annotion.Permission; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.common.service.IExpandComponentService; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.core.util.Convert; +import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.modular.assess.dto.*; import com.casic.missiles.modular.assess.enums.AssessExportEnum; import com.casic.missiles.modular.assess.model.AssessFactor; @@ -20,26 +22,19 @@ import com.casic.missiles.modular.enums.*; import com.casic.missiles.modular.system.model.Area; import com.casic.missiles.modular.system.model.User; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.OutputStream; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.casic.missiles.core.common.constant.factory.PageFactory; -import com.casic.missiles.core.base.response.ResponseData; - -import javax.servlet.http.HttpServletResponse; - - /** * 控制器 @@ -83,7 +78,7 @@ @ResponseBody public Object assessFactor() { List list = assessFactorService.list(); - AssessFactor assessFactor= list.get(0); + AssessFactor assessFactor = list.get(0); return ResponseData.success(assessFactor); } @@ -95,43 +90,35 @@ @ResponseBody public void batchExport(HttpServletResponse response, String beginDate, String endDate, String type) throws IOException { - if(type.equals("supervisor")){ - List supervisorDTOS=null; - supervisorDTOS = supervisorAssess(beginDate,endDate); - super.exportExcel(AssessExportEnum.SUPERVISOR_EXPORT,supervisorDTOS,response); - } - else if(type.equals("receiver")){ - List receiverDTOS=null; - receiverDTOS = receiverAssess(beginDate,endDate); - super.exportExcel(AssessExportEnum.RECEIVER_EXPORT,receiverDTOS,response); - } - else if(type.equals("monitor")){ - List monitorDTOS=null; - monitorDTOS = monitorAssess(beginDate,endDate); - super.exportExcel(AssessExportEnum.MONITOR_EXPORT,monitorDTOS,response); - } - else if(type.equals("dispatcher")){ - List dispatcherDTOS=null; - dispatcherDTOS = dispatcherAssess(beginDate,endDate); - super.exportExcel(AssessExportEnum.DISPATCHER_EXPORT,dispatcherDTOS,response); - } - else if(type.equals("area")){ + if (type.equals("supervisor")) { + List supervisorDTOS = null; + supervisorDTOS = supervisorAssess(beginDate, endDate); + super.exportExcel(AssessExportEnum.SUPERVISOR_EXPORT, supervisorDTOS, response); + } else if (type.equals("receiver")) { + List receiverDTOS = null; + receiverDTOS = receiverAssess(beginDate, endDate); + super.exportExcel(AssessExportEnum.RECEIVER_EXPORT, receiverDTOS, response); + } else if (type.equals("monitor")) { + List monitorDTOS = null; + monitorDTOS = monitorAssess(beginDate, endDate); + super.exportExcel(AssessExportEnum.MONITOR_EXPORT, monitorDTOS, response); + } else if (type.equals("dispatcher")) { + List dispatcherDTOS = null; + dispatcherDTOS = dispatcherAssess(beginDate, endDate); + super.exportExcel(AssessExportEnum.DISPATCHER_EXPORT, dispatcherDTOS, response); + } else if (type.equals("area")) { List areaDTOS = null; - areaDTOS = areaAssess(beginDate,endDate); - super.exportExcel(AssessExportEnum.AREA_EXPORT,areaDTOS,response); - } - else if(type.equals("overview")){ - List overviewDTOs= new ArrayList<>(); - OverviewDTO overviewDTO = overview(beginDate,endDate,null); + areaDTOS = areaAssess(beginDate, endDate); + super.exportExcel(AssessExportEnum.AREA_EXPORT, areaDTOS, response); + } else if (type.equals("overview")) { + List overviewDTOs = new ArrayList<>(); + OverviewDTO overviewDTO = overview(beginDate, endDate, null); overviewDTOs.add(overviewDTO); - super.exportExcel(AssessExportEnum.OVERVIEW_EXPORT,overviewDTOs,response); + super.exportExcel(AssessExportEnum.OVERVIEW_EXPORT, overviewDTOs, response); } } - - - /** * -----------------------------------------------------监督员------------------------------------------- * @@ -141,49 +128,53 @@ */ @RequestMapping(value = "/supervisor") @ResponseBody - public Object supervisor(String beginDate,String endDate) { List results =null; - results = supervisorAssess(beginDate,endDate); + public Object supervisor(String beginDate, String endDate) { + List results = null; + results = supervisorAssess(beginDate, endDate); return ResponseData.success(results); } + /** * 上报案件--监督员 */ @RequestMapping(value = "/supervisor/report") @ResponseBody - public Object reportPage(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object reportPage(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //上报人员 condition.setReportSupervisorId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 上报案卷中不予立案案卷--监督员 */ @RequestMapping(value = "/supervisor/notRegister") @ResponseBody - public Object notRegisterPage(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object notRegisterPage(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //上报人员 condition.setReportSupervisorId(personId); //不予立案案卷 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.NO_FILINGCASE.getState())); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 上报案卷中的立案案卷 及 上报的快速上报案卷(未经过立案操作)--监督员 */ @RequestMapping(value = "/supervisor/register") @ResponseBody - public Object register(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object register(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //上报人员 condition.setReportSupervisorId(personId); @@ -192,103 +183,105 @@ //快速上报案卷 condition.setEbCaseState2(String.valueOf(EbCaseStateEnum.ENDREPORT_QUIK.getState())); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 应核实案卷--监督员 */ @RequestMapping(value = "/supervisor/shouldVerify") @ResponseBody - public Object shouldVerify(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object shouldVerify(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //核实人员 condition.setVerifyPersonId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 核实案卷--监督员 */ @RequestMapping(value = "/supervisor/verify") @ResponseBody - public Object verify(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object verify(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //核实人员 condition.setVerifyPersonId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时核实案卷--监督员 */ @RequestMapping(value = "/supervisor/verifyOntime") @ResponseBody - public Object verifyOntime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object verifyOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //核实人员 condition.setVerifyPersonId(personId); //按时核实 condition.setIsVerifyOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 应核查案卷--监督员 */ @RequestMapping(value = "/supervisor/shouldCheck") @ResponseBody - public Object shouldCheck(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object shouldCheck(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //核查人员 condition.setCheckPersonId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 核查案卷--监督员 */ @RequestMapping(value = "/supervisor/check") @ResponseBody - public Object check(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object check(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //核查人员 condition.setCheckPersonId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时核查案卷--监督员 */ @RequestMapping(value = "/supervisor/checkOntime") @ResponseBody - public Object checkOntime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object checkOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //核查人员 condition.setCheckPersonId(personId); //按时核查 condition.setIsCheckOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } - - - - /** * -------------------------------------------------------受理员-------------------------------------------- * @@ -299,185 +292,194 @@ */ @RequestMapping(value = "/receiver") @ResponseBody - public Object receiver(String beginDate,String endDate) { + public Object receiver(String beginDate, String endDate) { List receiverDTOS = null; - receiverDTOS = receiverAssess(beginDate,endDate); + receiverDTOS = receiverAssess(beginDate, endDate); return ResponseData.success(receiverDTOS); } + /** * 不予立案案卷--受理员 */ @RequestMapping(value = "/receiver/notRegister") @ResponseBody - public Object notRegister(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object notRegister(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); //不予立案案卷 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.NO_FILINGCASE.getState())); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 立案案卷--受理员 */ @RequestMapping(value = "/receiver/register") @ResponseBody - public Object receiverregister(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object receiverregister(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); //立案案卷 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState())); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 受理案卷--受理员 */ @RequestMapping(value = "/receiver/receive") @ResponseBody - public Object receive(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object receive(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时立案案卷--受理员 */ @RequestMapping(value = "/receiver/registerOntime") @ResponseBody - public Object registerOn(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object registerOn(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); //未超时立案 condition.setIsRegisterOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时立案案卷--受理员 */ @RequestMapping(value = "/receiver/registerOvertime") @ResponseBody - public Object registerOver(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object registerOver(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); //未超时立案 condition.setIsRegisterOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 发送核实案卷--受理员 */ @RequestMapping(value = "/receiver/disVerify") @ResponseBody - public Object disVerify(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object disVerify(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //发送核实人员 condition.setDistributeVerifyPersonid(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时发送核实案卷--受理员 */ @RequestMapping(value = "/receiver/disVerifyOntime") @ResponseBody - public Object disVerifyOntime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object disVerifyOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //发送核实人员 condition.setDistributeVerifyPersonid(personId); //发送核实未超时 condition.setIsDisverifyOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时发送核实案卷--受理员 */ @RequestMapping(value = "/receiver/disVerifyOvertime") @ResponseBody - public Object disVerifyOvertime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object disVerifyOvertime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //发送核实人员 condition.setDistributeVerifyPersonid(personId); //发送核实超时 condition.setIsDisverifyOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 发送核查案卷--受理员 */ @RequestMapping(value = "/receiver/disCheck") @ResponseBody - public Object disCheck(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object disCheck(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //发送核查人员 condition.setDistributeCheckPersonid(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时发送核查案卷--受理员 */ @RequestMapping(value = "/receiver/disCheckOntime") @ResponseBody - public Object disCheckOntime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object disCheckOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //发送核查人员 condition.setDistributeCheckPersonid(personId); //发送核实未超时 condition.setIsDischeckOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时发送核查案卷--受理员 */ @RequestMapping(value = "/receiver/disCheckOvertime") @ResponseBody - public Object disCheckOvertime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object disCheckOvertime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //发送核查人员 condition.setDistributeCheckPersonid(personId); //发送核实超时 condition.setIsDischeckOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } - - /** * ------------------------------------------------值班长--------------------------------------------------- * @@ -488,101 +490,107 @@ */ @RequestMapping(value = "/monitor") @ResponseBody - public Object monitor(String beginDate,String endDate) { + public Object monitor(String beginDate, String endDate) { List monitorDTOS = null; - monitorDTOS = monitorAssess(beginDate,endDate); + monitorDTOS = monitorAssess(beginDate, endDate); return ResponseData.success(monitorDTOS); } + /** * 立案案卷--值班长 */ @RequestMapping(value = "/monitor/register") @ResponseBody - public Object monitorregister(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object monitorregister(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时立案案卷--值班长 */ @RequestMapping(value = "/monitor/registerOntime") @ResponseBody - public Object monitorregisterO(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object monitorregisterO(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); //未超时立案 condition.setIsRegisterOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时立案案卷--值班长 */ @RequestMapping(value = "/monitor/registerOvertime") @ResponseBody - public Object monitorregisterOv(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object monitorregisterOv(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setRegisterId(personId); //超时立案 condition.setIsRegisterOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 结案案卷--值班长 */ @RequestMapping(value = "/monitor/close") @ResponseBody - public Object close(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object close(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setCloseCasePersonid(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时结案案卷--值班长 */ @RequestMapping(value = "/monitor/closeOntime") @ResponseBody - public Object closeOntime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object closeOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setCloseCasePersonid(personId); //结案未超时 condition.setIsCloseOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时结案案卷--值班长 */ @RequestMapping(value = "/monitor/closeOvertime") @ResponseBody - public Object closeOvertime(String beginDate,String endDate,String personId) { - Condition condition=new Condition(); + public Object closeOvertime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //立案人员 condition.setCloseCasePersonid(personId); //结案未超时 condition.setIsCloseOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } @@ -595,179 +603,190 @@ */ @RequestMapping(value = "/dispatcher") @ResponseBody - public Object dispatcher(String beginDate,String endDate) { - List dispatcherDTOS =null; - dispatcherDTOS = dispatcherAssess(beginDate,endDate); + public Object dispatcher(String beginDate, String endDate) { + List dispatcherDTOS = null; + dispatcherDTOS = dispatcherAssess(beginDate, endDate); return ResponseData.success(dispatcherDTOS); } + /** * 派遣案卷--派遣员 */ @RequestMapping(value = "/dispatcher/distribute") @ResponseBody - public Object dis(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object dis(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //派遣人员 condition.setDistributePersonId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时派遣案卷--派遣员 */ @RequestMapping(value = "/dispatcher/disOntime") @ResponseBody - public Object disOntime(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object disOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //派遣人员 condition.setDistributePersonId(personId); //按时派遣 condition.setIsDistributeOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时派遣案卷--派遣员 */ @RequestMapping(value = "/dispatcher/disOvertime") @ResponseBody - public Object disOvertime(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object disOvertime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //派遣人员 condition.setDistributePersonId(personId); //按时派遣 condition.setIsDistributeOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 准确派遣案卷 -- 派遣员 */ @RequestMapping(value = "/dispatcher/disExact") @ResponseBody - public Object disExact(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object disExact(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //派遣人员 condition.setDistributePersonId(personId); //未调整 condition.setIsAdjust("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 错误派遣案卷--派遣员 */ @RequestMapping(value = "/dispatcher/disWrong") @ResponseBody - public Object disWrong(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object disWrong(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //派遣人员 condition.setDistributePersonId(personId); //未调整 condition.setIsAdjust("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 处理审核案卷--派遣员 */ @RequestMapping(value = "/dispatcher/proAudit") @ResponseBody - public Object processAudit(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object processAudit(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //处理审核人员 condition.setProcessAuditPersonid(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时处理审核案卷--派遣员 */ @RequestMapping(value = "/dispatcher/proAuditOntime") @ResponseBody - public Object processAuditOntime(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object processAuditOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //处理审核人员 condition.setProcessAuditPersonid(personId); //处理审核未超时 condition.setIsProcessauditOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时处理审核案卷--派遣员 */ @RequestMapping(value = "/dispatcher/proAuditOvertime") @ResponseBody - public Object processAuditOvertime(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object processAuditOvertime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //处理审核人员 condition.setProcessAuditPersonid(personId); //处理审核未超时 condition.setIsProcessauditOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 调整案卷--派遣员 */ @RequestMapping(value = "/dispatcher/adjust") @ResponseBody - public Object adjust(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object adjust(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //调整人员 condition.setAdjustPersonId(personId); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 按时调整案卷--派遣员 */ @RequestMapping(value = "/dispatcher/adjustOntime") @ResponseBody - public Object adjustOntime(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object adjustOntime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //调整人员 condition.setAdjustPersonId(personId); //调整未超时 condition.setIsAdjustOvertime("0"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } + /** * 超时调整案卷--派遣员 */ @RequestMapping(value = "/dispatcher/adjustOvertime") @ResponseBody - public Object adjustOvertime(String beginDate,String endDate,String personId){ - Condition condition=new Condition(); + public Object adjustOvertime(String beginDate, String endDate, String personId) { + Condition condition = new Condition(); //调整人员 condition.setAdjustPersonId(personId); //调整未超时 condition.setIsAdjustOvertime("1"); - PageInfoBT> results = queryByCondition(beginDate, endDate,condition); + PageInfoBT> results = queryByCondition(beginDate, endDate, condition); return ResponseData.success(results); } @@ -780,9 +799,9 @@ */ @RequestMapping(value = "/area") @ResponseBody - public Object area(String beginDate,String endDate) { + public Object area(String beginDate, String endDate) { List areaDTOS = null; - areaDTOS = areaAssess(beginDate,endDate); + areaDTOS = areaAssess(beginDate, endDate); return ResponseData.success(areaDTOS); } @@ -792,9 +811,9 @@ */ @RequestMapping(value = "/overview") @ResponseBody - public Object overviewC(String beginDate,String endDate) { - OverviewDTO overviewDTO =null; - overviewDTO = overview(beginDate, endDate,null); + public Object overviewC(String beginDate, String endDate) { + OverviewDTO overviewDTO = null; + overviewDTO = overview(beginDate, endDate, null); return ResponseData.success(overviewDTO); } @@ -803,13 +822,13 @@ */ @RequestMapping(value = "/case/overview") @ResponseBody - public Object caseOverview(String beginDate,String endDate) { - OverviewDTO overviewDTO =null; - overviewDTO = overview(beginDate, endDate,null); - Map map = new HashMap<>(); - map.put("report",Convert.toInt(overviewDTO.getQuickReport())+Convert.toInt(overviewDTO.getNormalReport())); - map.put("register",Convert.toInt(overviewDTO.getRegister())); - map.put("process",Convert.toInt(overviewDTO.getProcess())); + public Object caseOverview(String beginDate, String endDate) { + OverviewDTO overviewDTO = null; + overviewDTO = overview(beginDate, endDate, null); + Map map = new HashMap<>(); + map.put("report", Convert.toInt(overviewDTO.getQuickReport()) + Convert.toInt(overviewDTO.getNormalReport())); + map.put("register", Convert.toInt(overviewDTO.getRegister())); + map.put("process", Convert.toInt(overviewDTO.getProcess())); return ResponseData.success(map); } @@ -821,14 +840,14 @@ //查询 - private PageInfoBT> queryByCondition(String beginDate,String endDate, Condition condition){ - List> results = null; + private PageInfoBT> queryByCondition(String beginDate, String endDate, Condition condition) { + List> results = null; Page> page = new PageFactory>().defaultPage(); condition.setBeginDate(beginDate);//查询开始日期 condition.setEndDate(endDate);//查询结束日期 - results = assessFactorService.selectByCondition(condition,page); + results = assessFactorService.selectByCondition(condition, page); new AssessWarpper(results).warp(); page.setRecords(results); @@ -837,28 +856,35 @@ } - + private int getDaySub(String beginDate, String endDate) { + try { + return (int) DateUtil.getDaySub(beginDate, endDate); + } catch (Exception e) { + e.printStackTrace(); + } + return 1; + } //监督员考核结果 - private List supervisorAssess(String beginDate,String endDate){ + private List supervisorAssess(String beginDate, String endDate) { DecimalFormat df = new DecimalFormat("0.0"); - + int dayNum = getDaySub(beginDate, endDate); //读取考核规则 AssessFactor assessFactor = assessFactorService.list().get(0); - int shouldReport = assessFactor.getShouldReport();//要求上报数 - float verifyFactor =(float)assessFactor.getVerify()/100;//核实因子 - float checkFactor = (float)assessFactor.getCheckFactor()/100;//核查因子 + int shouldReport = assessFactor.getShouldReport() * dayNum;//要求上报数 + float verifyFactor = (float) assessFactor.getVerify() / 100;//核实因子 + float checkFactor = (float) assessFactor.getCheckFactor() / 100;//核查因子 //监督员列表 List personList = service.getRoleUsersByTips(CwsRoleEnums.SUPERVISOR.getRoleTip()); List supervisorDTOS = new ArrayList<>(); - Condition condition= null; - for (User user:personList) { + Condition condition = null; + for (User user : personList) { SupervisorDTO supervisorDTO = new SupervisorDTO(); - supervisorDTO.setShouldReport(shouldReport+"");//要求上报数 + supervisorDTO.setShouldReport(shouldReport + "");//要求上报数 - String personId = user.getId()+""; + String personId = user.getId() + ""; supervisorDTO.setPersonId(personId);//监督员id supervisorDTO.setName(user.getName());//监督员姓名 @@ -867,57 +893,57 @@ condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setReportSupervisorId(personId );//上报人员 + condition.setReportSupervisorId(personId);//上报人员 Long report = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setReport(report+"");//上报数 + supervisorDTO.setReport(report + "");//上报数 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.NO_FILINGCASE.getState()));//不予立案 Long notRegister = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setNotRegister(notRegister+"");//不予立案数 + supervisorDTO.setNotRegister(notRegister + "");//不予立案数 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()));//有效立案 Long register = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setRegister(register+"");//立案数 - supervisorDTO.setRegisterRate(getRate(register,report,df));//立案率 + supervisorDTO.setRegister(register + "");//立案数 + supervisorDTO.setRegisterRate(getRate(register, report, df));//立案率 //核实 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setVerifyPersonId(personId );//核实人员 + condition.setVerifyPersonId(personId);//核实人员 Long verify = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setShouldVerify(verify+"");//应核实数 - supervisorDTO.setVerify(verify+"");//核实数 - supervisorDTO.setVerifyRate(getRate(verify,verify,df));//核实率 + supervisorDTO.setShouldVerify(verify + "");//应核实数 + supervisorDTO.setVerify(verify + "");//核实数 + supervisorDTO.setVerifyRate(getRate(verify, verify, df));//核实率 condition.setIsVerifyOvertime("0");//按时核实 Long verifyOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setVerifyOntime(verifyOntime+"");//按时核实数 - supervisorDTO.setVerifyOntimeRate(getRate(verifyOntime,verify,df));//按时核实率 + supervisorDTO.setVerifyOntime(verifyOntime + "");//按时核实数 + supervisorDTO.setVerifyOntimeRate(getRate(verifyOntime, verify, df));//按时核实率 //核查 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setCheckPersonId(personId );//核查人员 - Long check= Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setShouldCheck(check+"");//应核查数 - supervisorDTO.setCheck(check+"");//核查数 - supervisorDTO.setCheckRate(getRate(check,check,df));//核查率 + condition.setCheckPersonId(personId);//核查人员 + Long check = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + supervisorDTO.setShouldCheck(check + "");//应核查数 + supervisorDTO.setCheck(check + "");//核查数 + supervisorDTO.setCheckRate(getRate(check, check, df));//核查率 condition.setIsCheckOvertime("0");//按时核查 Long checkOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - supervisorDTO.setCheckOntime(checkOntime+"");//按时核查数 - supervisorDTO.setCheckOntimeRate(getRate(checkOntime,check,df));//按时核查率 + supervisorDTO.setCheckOntime(checkOntime + "");//按时核查数 + supervisorDTO.setCheckOntimeRate(getRate(checkOntime, check, df));//按时核查率 //综合指标 float reportScore = 0; - float checkOvertimeScore =0; - float verifyOvertimeScore=0; - if(shouldReport>0) reportScore = (float) register/shouldReport*100;//上报分数 - if(check>0) checkOvertimeScore = (check-checkOntime)/check*100*checkFactor;//未按时核查分 - if(verify>0) verifyOvertimeScore = (verify-verifyOntime)/verify*100*verifyFactor;//未按时核实分 - String score = df.format(reportScore-checkOvertimeScore-verifyOvertimeScore); + float checkOvertimeScore = 0; + float verifyOvertimeScore = 0; + if (shouldReport > 0) reportScore = (float) register / shouldReport * 100;//上报分数 + if (check > 0) checkOvertimeScore = (check - checkOntime) / check * 100 * checkFactor;//未按时核查分 + if (verify > 0) verifyOvertimeScore = (verify - verifyOntime) / verify * 100 * verifyFactor;//未按时核实分 + String score = df.format(reportScore - checkOvertimeScore - verifyOvertimeScore); supervisorDTO.setScore(score); //等级 @@ -929,25 +955,25 @@ } //受理员考核结果 - private List receiverAssess(String beginDate,String endDate){ - List receiverDTOS= new ArrayList<>(); + private List receiverAssess(String beginDate, String endDate) { + List receiverDTOS = new ArrayList<>(); DecimalFormat df = new DecimalFormat("0.0"); //读取考核规则 AssessFactor assessFactor = assessFactorService.list().get(0); - float registerOntimeFactor = (float)assessFactor.getRegisterOntimeReceiver()/100;//受理员考核按时立案因子 - float disVerifyOntimeFactor =(float)assessFactor.getDisVerifyOntime()/100;//按时发送核实因子 - float disCheckOntimeFactor =(float)assessFactor.getDisCheckOntime()/100;//按时发送核查因子 + float registerOntimeFactor = (float) assessFactor.getRegisterOntimeReceiver() / 100;//受理员考核按时立案因子 + float disVerifyOntimeFactor = (float) assessFactor.getDisVerifyOntime() / 100;//按时发送核实因子 + float disCheckOntimeFactor = (float) assessFactor.getDisCheckOntime() / 100;//按时发送核查因子 //受理员列表 List personList = service.getRoleUsersByTips(CwsRoleEnums.RECEIVER.getRoleTip()); - Condition condition= null; - for (User user:personList) { + Condition condition = null; + for (User user : personList) { ReceiverDTO receiverDTO = new ReceiverDTO(); - String personId = user.getId()+""; + String personId = user.getId() + ""; receiverDTO.setPersonId(personId);//受理员id receiverDTO.setName(user.getName());//受理员姓名 @@ -956,71 +982,71 @@ condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setRegisterId(personId );//立案人员 + condition.setRegisterId(personId);//立案人员 Long receive = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setReceive(receive+"");//总受理数 + receiverDTO.setReceive(receive + "");//总受理数 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.NO_FILINGCASE.getState()));//不予立案 Long notRegister = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setNotRegister(notRegister+"");//不予立案数 + receiverDTO.setNotRegister(notRegister + "");//不予立案数 condition.setEbCaseState(String.valueOf(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()));//有效立案 Long register = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setRegister(register+"");//立案数 + receiverDTO.setRegister(register + "");//立案数 condition.setIsRegisterOvertime("0"); Long registerOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setRegisterOntime(registerOntime+"");//按时立案数 + receiverDTO.setRegisterOntime(registerOntime + "");//按时立案数 condition.setIsRegisterOvertime("1"); Long registerOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setRegisterOvertime(registerOvertime+"");//超时立案数 - receiverDTO.setRegisterOntimeRate(getRate(registerOntime,register,df));//按时立案率 + receiverDTO.setRegisterOvertime(registerOvertime + "");//超时立案数 + receiverDTO.setRegisterOntimeRate(getRate(registerOntime, register, df));//按时立案率 //核实 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setDistributeVerifyPersonid(personId );//发送核实人员 + condition.setDistributeVerifyPersonid(personId);//发送核实人员 Long disVerify = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setDisVerify(disVerify+"");//发送核实数 + receiverDTO.setDisVerify(disVerify + "");//发送核实数 condition.setIsDisverifyOvertime("0"); Long disVerifyOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setDisVerifyOntime(disVerifyOntime+"");//按时发送核实数 + receiverDTO.setDisVerifyOntime(disVerifyOntime + "");//按时发送核实数 condition.setIsDisverifyOvertime("1"); Long disVerifyOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setDisVerifyOvertime(disVerifyOvertime+"");//超时发送核实数 - receiverDTO.setDisVerifyOntimeRate(getRate(disVerifyOntime,disVerify,df));//按时发送核实率 + receiverDTO.setDisVerifyOvertime(disVerifyOvertime + "");//超时发送核实数 + receiverDTO.setDisVerifyOntimeRate(getRate(disVerifyOntime, disVerify, df));//按时发送核实率 //核查 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setDistributeCheckPersonid(personId );//发送核查人员 + condition.setDistributeCheckPersonid(personId);//发送核查人员 Long disCheck = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setDisCheck(disCheck+"");//发送核查数 + receiverDTO.setDisCheck(disCheck + "");//发送核查数 condition.setIsDischeckOvertime("0"); Long disCheckOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setDisCheckOntime(disCheckOntime+"");//按时发送核查数 + receiverDTO.setDisCheckOntime(disCheckOntime + "");//按时发送核查数 condition.setIsDisverifyOvertime("1"); Long disCheckOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - receiverDTO.setDisCheckOvertime(disCheckOvertime+"");//超时发送核查数 - receiverDTO.setDisCheckOntimeRate(getRate(disCheckOntime,disCheck,df));//按时发送核查率 + receiverDTO.setDisCheckOvertime(disCheckOvertime + "");//超时发送核查数 + receiverDTO.setDisCheckOntimeRate(getRate(disCheckOntime, disCheck, df));//按时发送核查率 //综合指标 float registerScore = 0; - float disVerifyScore =0; - float disCheckScore =0; - if(receive>0) registerScore = (float) registerOntime/receive*100*registerOntimeFactor;//按时立案分 - if(disVerify>0) disVerifyScore = disVerifyOntime/disVerify*100*disVerifyOntimeFactor;//按时发送核实分 - if(disCheck>0) disCheckScore = disCheckOntime/disCheck*100*disCheckOntimeFactor;//按时发送核查分 - String score = df.format(registerScore+disVerifyScore+disCheckScore); + float disVerifyScore = 0; + float disCheckScore = 0; + if (receive > 0) registerScore = (float) registerOntime / receive * 100 * registerOntimeFactor;//按时立案分 + if (disVerify > 0) disVerifyScore = disVerifyOntime / disVerify * 100 * disVerifyOntimeFactor;//按时发送核实分 + if (disCheck > 0) disCheckScore = disCheckOntime / disCheck * 100 * disCheckOntimeFactor;//按时发送核查分 + String score = df.format(registerScore + disVerifyScore + disCheckScore); receiverDTO.setScore(score); //等级 @@ -1033,26 +1059,26 @@ } //值班长考核结果 - private List monitorAssess(String beginDate,String endDate){ - List monitorDTOS= new ArrayList<>(); + private List monitorAssess(String beginDate, String endDate) { + List monitorDTOS = new ArrayList<>(); DecimalFormat df = new DecimalFormat("0.0"); DecimalFormat df2 = new DecimalFormat("0.00"); //读取考核规则 AssessFactor assessFactor = assessFactorService.list().get(0); - float registerOntimeFactor = (float)assessFactor.getRegisterOntimeMonitor()/100;//值班长按时立案因子 - float closeOntimeFactor =(float)assessFactor.getCloseOntime()/100;//按时结案因子 - float teamMarkFactor =(float)assessFactor.getTeamMark()/100;//团队分因子 + float registerOntimeFactor = (float) assessFactor.getRegisterOntimeMonitor() / 100;//值班长按时立案因子 + float closeOntimeFactor = (float) assessFactor.getCloseOntime() / 100;//按时结案因子 + float teamMarkFactor = (float) assessFactor.getTeamMark() / 100;//团队分因子 //值班长列表 List personList = service.getRoleUsersByTips(CwsRoleEnums.MONITOR.getRoleTip()); - Condition condition= null; - for (User user:personList) { + Condition condition = null; + for (User user : personList) { MonitorDTO monitorDTO = new MonitorDTO(); - String personId = user.getId()+""; + String personId = user.getId() + ""; monitorDTO.setPersonId(personId);//值班长id monitorDTO.setName(user.getName());//值班长姓名 @@ -1061,62 +1087,61 @@ condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setRegisterId(personId );//立案人员 + condition.setRegisterId(personId);//立案人员 Long register = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - monitorDTO.setRegister(register+"");//立案数 + monitorDTO.setRegister(register + "");//立案数 condition.setIsRegisterOvertime("0"); Long registerOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - monitorDTO.setRegisterOntime(registerOntime+"");//按时立案数 + monitorDTO.setRegisterOntime(registerOntime + "");//按时立案数 condition.setIsRegisterOvertime("1"); Long registerOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - monitorDTO.setRegisterOvertime(registerOvertime+"");//超时立案数 - monitorDTO.setRegisterOntimeRate(getRate(registerOntime,register,df));//按时立案率 + monitorDTO.setRegisterOvertime(registerOvertime + "");//超时立案数 + monitorDTO.setRegisterOntimeRate(getRate(registerOntime, register, df));//按时立案率 //结案 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setCloseCasePersonid(personId );//结案人员 + condition.setCloseCasePersonid(personId);//结案人员 Long close = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - monitorDTO.setClose(close+"");//结案数 + monitorDTO.setClose(close + "");//结案数 condition.setIsCloseOvertime("0"); Long closeOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - monitorDTO.setCloseOntime(closeOntime+"");//按时结案数 + monitorDTO.setCloseOntime(closeOntime + "");//按时结案数 condition.setIsCloseOvertime("1"); - Long closeOvertime =Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - monitorDTO.setCloseOvertime(closeOvertime+"");//超时结案数 - monitorDTO.setCloseOntimeRate(getRate(closeOntime,close,df));//按时结案率 + Long closeOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + monitorDTO.setCloseOvertime(closeOvertime + "");//超时结案数 + monitorDTO.setCloseOntimeRate(getRate(closeOntime, close, df));//按时结案率 //受理员平均分 - List receiverDTOS = receiverAssess(beginDate,endDate); + List receiverDTOS = receiverAssess(beginDate, endDate); double avr = 0.0; int receiverNum = receiverDTOS.size(); float totalScore = 0; - for (ReceiverDTO receiverDTO:receiverDTOS) { + for (ReceiverDTO receiverDTO : receiverDTOS) { totalScore = totalScore + Float.valueOf(receiverDTO.getScore()); } - if(totalScore>0 && receiverNum>0){ - avr = totalScore/receiverNum; + if (totalScore > 0 && receiverNum > 0) { + avr = totalScore / receiverNum; } - //综合指标 - float registerScore=0; - float closeScore =0; + float registerScore = 0; + float closeScore = 0; double teamScore = 0; - if(register>0) registerScore = (float) registerOntime/register*100*registerOntimeFactor;//按时立案分 - if(close>0) closeScore = (float)closeOntime/close*100*closeOntimeFactor;//按时结案分 - teamScore = avr*teamMarkFactor;//团队分 + if (register > 0) registerScore = (float) registerOntime / register * 100 * registerOntimeFactor;//按时立案分 + if (close > 0) closeScore = (float) closeOntime / close * 100 * closeOntimeFactor;//按时结案分 + teamScore = avr * teamMarkFactor;//团队分 monitorDTO.setReceiverAverage(df2.format(teamScore));//受理员平均分 - String score = df2.format(registerScore+closeScore+teamScore); + String score = df2.format(registerScore + closeScore + teamScore); monitorDTO.setScore(score); //等级 @@ -1129,25 +1154,25 @@ } //派遣员考核结果 - private List dispatcherAssess(String beginDate,String endDate){ - List dispatcherDTOS= new ArrayList<>(); + private List dispatcherAssess(String beginDate, String endDate) { + List dispatcherDTOS = new ArrayList<>(); DecimalFormat df = new DecimalFormat("0.0"); //读取考核规则 AssessFactor assessFactor = assessFactorService.list().get(0); - float disOntimeFactor = (float)assessFactor.getDisOntime()/100;//按时派遣因子 - float disExactFactor =(float)assessFactor.getDisExact()/100;//准确派遣因子 - float processAuditOntimeFactor =(float)assessFactor.getProcessAuditOntime()/100;//按时处理审核因子 - float adjustOntimeFactor =(float)assessFactor.getAdjustOntime()/100;//按时调整因子 + float disOntimeFactor = (float) assessFactor.getDisOntime() / 100;//按时派遣因子 + float disExactFactor = (float) assessFactor.getDisExact() / 100;//准确派遣因子 + float processAuditOntimeFactor = (float) assessFactor.getProcessAuditOntime() / 100;//按时处理审核因子 + float adjustOntimeFactor = (float) assessFactor.getAdjustOntime() / 100;//按时调整因子 //派遣员列表 List personList = service.getRoleUsersByTips(CwsRoleEnums.DISPATCHER.getRoleTip()); - Condition condition= null; - for (User user:personList) { + Condition condition = null; + for (User user : personList) { DispatcherDTO dispatcherDTO = new DispatcherDTO(); - String personId = user.getId()+""; + String personId = user.getId() + ""; dispatcherDTO.setPersonId(personId);//派遣员id dispatcherDTO.setName(user.getName());//派遣员姓名 @@ -1158,76 +1183,77 @@ condition.setEndDate(endDate); condition.setDistributePersonId(personId);//派遣人员 Long distribute = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setDistribute(distribute+"");//派遣数 + dispatcherDTO.setDistribute(distribute + "");//派遣数 condition.setIsDistributeOvertime("0"); - Long distributeOntime =Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setDisOntime(distributeOntime+"");//按时派遣数 + Long distributeOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + dispatcherDTO.setDisOntime(distributeOntime + "");//按时派遣数 condition.setIsDistributeOvertime("1"); - Long distributeOvertime =Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setDisOvertime(distributeOvertime+"");//超时派遣数 - dispatcherDTO.setDisOntimeRate(getRate(distributeOntime,distribute,df));//按时派遣率 + Long distributeOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + dispatcherDTO.setDisOvertime(distributeOvertime + "");//超时派遣数 + dispatcherDTO.setDisOntimeRate(getRate(distributeOntime, distribute, df));//按时派遣率 condition.setIsDistributeOvertime(null); condition.setIsAdjust("0"); - Long distributeExact =Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setDisExact(distributeExact+"");//准确派遣数 + Long distributeExact = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + dispatcherDTO.setDisExact(distributeExact + "");//准确派遣数 condition.setIsAdjust("1"); Long distributeWrong = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setDisWrong(distributeWrong+"");//错误派遣数 - dispatcherDTO.setDisExactRate(getRate(distributeExact,distribute,df));//准确派遣率 + dispatcherDTO.setDisWrong(distributeWrong + "");//错误派遣数 + dispatcherDTO.setDisExactRate(getRate(distributeExact, distribute, df));//准确派遣率 // 处理审核 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setProcessAuditPersonid(personId );//处理审核人员 + condition.setProcessAuditPersonid(personId);//处理审核人员 Long processAudit = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setProAudit(processAudit+"");//处理审核数 + dispatcherDTO.setProAudit(processAudit + "");//处理审核数 condition.setIsProcessauditOvertime("0"); - Long processAuditOntime =Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setProAuditOntime(processAuditOntime+"");//按时处理审核数 + Long processAuditOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + dispatcherDTO.setProAuditOntime(processAuditOntime + "");//按时处理审核数 condition.setIsProcessauditOvertime("1"); Long processAuditOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setProAuditOvertime(processAuditOvertime+"");//超时处理审核数 - dispatcherDTO.setProAuditOntimeRate(getRate(processAuditOntime,processAudit,df));//按时处理审核率 + dispatcherDTO.setProAuditOvertime(processAuditOvertime + "");//超时处理审核数 + dispatcherDTO.setProAuditOntimeRate(getRate(processAuditOntime, processAudit, df));//按时处理审核率 // 调整 condition = new Condition(); condition.setBeginDate(beginDate); condition.setEndDate(endDate); - condition.setAdjustPersonId(personId );//调整人员 + condition.setAdjustPersonId(personId);//调整人员 Long adjust = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setAdjust(adjust+"");//调整数 + dispatcherDTO.setAdjust(adjust + "");//调整数 condition.setIsAdjustOvertime("0"); Long adjustOntime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setAdjustOntime(adjustOntime+"");//按时调整数 + dispatcherDTO.setAdjustOntime(adjustOntime + "");//按时调整数 condition.setIsAdjustOvertime("1"); - Long adjustOvertime =Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); - dispatcherDTO.setAdjustOvertime(adjustOvertime+"");//超时调整数 - dispatcherDTO.setAdjustOntimeRate(getRate(adjustOntime,adjust,df));//按时调整率 + Long adjustOvertime = Long.valueOf(assessFactorService.countByCondition(condition).get("num").toString()); + dispatcherDTO.setAdjustOvertime(adjustOvertime + "");//超时调整数 + dispatcherDTO.setAdjustOntimeRate(getRate(adjustOntime, adjust, df));//按时调整率 //综合指标 - float disOntimeScore=0; - float disExactScore =0; + float disOntimeScore = 0; + float disExactScore = 0; float proAuditScore = 0; float adjustScore = 0; - if(distribute>0) { + if (distribute > 0) { disOntimeScore = (float) distributeOntime / distribute * 100 * disOntimeFactor;//按时派遣分 disExactScore = (float) distributeExact / distribute * 100 * disExactFactor;//准确派遣分 } - if(processAudit>0)proAuditScore = (float) processAuditOntime/processAudit * 100 * processAuditOntimeFactor;//按时处理审核分 - if(adjust>0) adjustScore = (float) adjustOntime/adjust *100 *adjustOntimeFactor;//按时调整分 - String score = df.format(disOntimeScore+disExactScore+proAuditScore+adjustScore); + if (processAudit > 0) + proAuditScore = (float) processAuditOntime / processAudit * 100 * processAuditOntimeFactor;//按时处理审核分 + if (adjust > 0) adjustScore = (float) adjustOntime / adjust * 100 * adjustOntimeFactor;//按时调整分 + String score = df.format(disOntimeScore + disExactScore + proAuditScore + adjustScore); dispatcherDTO.setScore(score); //等级 @@ -1239,31 +1265,28 @@ } - - - //区域评价结果 - public List areaAssess(String beginDate,String endDate){ + public List areaAssess(String beginDate, String endDate) { List areaDTOS = new ArrayList<>(); DecimalFormat df = new DecimalFormat("0.00"); List list = assessFactorService.list(); - AssessFactor assessFactor= list.get(0); + AssessFactor assessFactor = list.get(0); //区域列表 - EntityWrapper entityWrapper=new EntityWrapper(); + EntityWrapper entityWrapper = new EntityWrapper(); entityWrapper.eq("LEVEL", AreaLevelEnum.RESPONSIBILITY_GRID.getState()); - List areaList = expandComponentService.getAreas(entityWrapper,null); - for (Area area:areaList) { + List areaList = expandComponentService.getAreas(entityWrapper, null); + for (Area area : areaList) { // if(!"东乡县".equals(area.getAreaName())){ // continue; // } - AreaDTO areaDTO =new AreaDTO(); + AreaDTO areaDTO = new AreaDTO(); - String areaId = area.getId()+""; + String areaId = area.getId() + ""; //网格整体概况 OverviewDTO overviewDTO = null; - overviewDTO = overview(beginDate,endDate,areaId); + overviewDTO = overview(beginDate, endDate, areaId); areaDTO.setAreaId(areaId);//网格id areaDTO.setAreaName(area.getAreaName());//网格名称 @@ -1272,51 +1295,51 @@ CountCondition countCondition = new CountCondition(); countCondition.setBeginDate(beginDate); countCondition.setEndDate(endDate); - countCondition.setAreaId(area.getId()+""); - Long report = (Long) assessFactorService.countByCountCondition(countCondition).get("num");//上报数 + countCondition.setAreaId(area.getId() + ""); + Long report = (Long) assessFactorService.countByCountCondition(countCondition).get("num");//上报数 countCondition.setIsPublic("1"); - Long publicReport = (Long)assessFactorService.countByCountCondition(countCondition).get("num");//公众举报数 - areaDTO.setPublicReportRate(getRate(publicReport,report,df));//公众举报率 + Long publicReport = (Long) assessFactorService.countByCountCondition(countCondition).get("num");//公众举报数 + areaDTO.setPublicReportRate(getRate(publicReport, report, df));//公众举报率 //立案 Long register = Long.valueOf(overviewDTO.getRegister()); - areaDTO.setRegister(register+"");//立案数 + areaDTO.setRegister(register + "");//立案数 //结案 - Long close= Long.valueOf(overviewDTO.getClose()); - areaDTO.setClose(close+"");//结案数 - areaDTO.setCloseRate(getRate(close,register,df));//结案率 + Long close = Long.valueOf(overviewDTO.getClose()); + areaDTO.setClose(close + "");//结案数 + areaDTO.setCloseRate(getRate(close, register, df));//结案率 //公众举报/上报数 //立案分值 0件100分；1-2件90分；3-4件75分；5-6件60分；7-8件40分；9件或以上0分 //综合指标 = 公众举报分值*10% + 立案数分值 * 30% + 结案率分值 *20% + 按期结案率分值 * 30% + 按期处置率分值 * 10% - String score=""; - double publicReportScore = Double.valueOf(areaDTO.getPublicReportRate().replace("%",""));//公众举报分值 - double registerScore = 0.0 ;//立案数分值 + String score = ""; + double publicReportScore = Double.valueOf(areaDTO.getPublicReportRate().replace("%", ""));//公众举报分值 + double registerScore = 0.0;//立案数分值 //立案数分值算法：0件100分；1-2件90分；3-4件75分；5-6件60分；7-8件40分；9件或以上0分 - if (register >= 0 && register<=100) { - registerScore = 100 ; - } else if (register > 100 && register<=200) { - registerScore = 90 ; - } else if (register > 200 && register<=400) { - registerScore = 75 ; - } else if (register > 400 && register<=600) { - registerScore = 60 ; - } else if (register > 600 && register<=800) { - registerScore = 40 ; + if (register >= 0 && register <= 100) { + registerScore = 100; + } else if (register > 100 && register <= 200) { + registerScore = 90; + } else if (register > 200 && register <= 400) { + registerScore = 75; + } else if (register > 400 && register <= 600) { + registerScore = 60; + } else if (register > 600 && register <= 800) { + registerScore = 40; } else { - registerScore = 0 ; + registerScore = 0; } - double closeScore = Double.valueOf(areaDTO.getCloseRate().replace("%",""));// 结案率分值 - double closeOntimeScore = Double.valueOf(overviewDTO.getCloseOntimeRate().replace("%",""));// 按期结案率分值 - double proOntimeScore = Double.valueOf(overviewDTO.getProOntimeRate().replace("%",""));// 按期处置率分值 + double closeScore = Double.valueOf(areaDTO.getCloseRate().replace("%", ""));// 结案率分值 + double closeOntimeScore = Double.valueOf(overviewDTO.getCloseOntimeRate().replace("%", ""));// 按期结案率分值 + double proOntimeScore = Double.valueOf(overviewDTO.getProOntimeRate().replace("%", ""));// 按期处置率分值 - float publicReportFactor = (float)assessFactor.getPublicReportFactor()/100;//区域考核-公众举报调节因子 - float registerFactor =(float)assessFactor.getRegisterFactor()/100;//区域考核-立案数调节因子 - float closeFactor =(float)assessFactor.getCloseFactor()/100;//区域考核-按期结案 调节因子 - float closeOntimeFactor =(float)assessFactor.getCloseOntimeFactor()/100;//区域考核-按期结案 调节因子 - float proOntimeFactor =(float)assessFactor.getProOntimeFactor()/100;//区域考核-按期处置 调节因子 + float publicReportFactor = (float) assessFactor.getPublicReportFactor() / 100;//区域考核-公众举报调节因子 + float registerFactor = (float) assessFactor.getRegisterFactor() / 100;//区域考核-立案数调节因子 + float closeFactor = (float) assessFactor.getCloseFactor() / 100;//区域考核-按期结案 调节因子 + float closeOntimeFactor = (float) assessFactor.getCloseOntimeFactor() / 100;//区域考核-按期结案 调节因子 + float proOntimeFactor = (float) assessFactor.getProOntimeFactor() / 100;//区域考核-按期处置 调节因子 - score = df.format(publicReportScore*publicReportFactor + registerScore * registerFactor + closeScore * closeFactor + closeOntimeScore * closeOntimeFactor + proOntimeScore * proOntimeFactor); + score = df.format(publicReportScore * publicReportFactor + registerScore * registerFactor + closeScore * closeFactor + closeOntimeScore * closeOntimeFactor + proOntimeScore * proOntimeFactor); areaDTO.setScore(score); @@ -1330,94 +1353,94 @@ } //整体概况结果 - public OverviewDTO overview(String beginDate,String endDate,String areaId){ + public OverviewDTO overview(String beginDate, String endDate, String areaId) { DecimalFormat df = new DecimalFormat("0.00"); - OverviewDTO overviewDTO =new OverviewDTO(); + OverviewDTO overviewDTO = new OverviewDTO(); CountCondition countCondition = new CountCondition(); countCondition.setBeginDate(beginDate); countCondition.setEndDate(endDate); //如果查询某区域数据 - if(areaId!=null)countCondition.setAreaId(String.valueOf(areaId)); + if (areaId != null) countCondition.setAreaId(String.valueOf(areaId)); - Long report = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setReport(report+"");//总上报数 + Long report = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setReport(report + "");//总上报数 - countCondition.setSource(SourceEnum.ENDREPORT_QUIK.getState()+""); + countCondition.setSource(SourceEnum.ENDREPORT_QUIK.getState() + ""); Long quickReport = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setQuickReport(quickReport+"");//快速上报数 + overviewDTO.setQuickReport(quickReport + "");//快速上报数 - countCondition.setSource(SourceEnum.ENDREPORT_NORMAL.getState()+""); + countCondition.setSource(SourceEnum.ENDREPORT_NORMAL.getState() + ""); Long normalReport = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setNormalReport(normalReport+"");//普通上报数 + overviewDTO.setNormalReport(normalReport + "");//普通上报数 countCondition.setSource(null); - countCondition.setCaseState(CaseStateEnum.TO_BE_VERIFIED.getState()+""); + countCondition.setCaseState(CaseStateEnum.TO_BE_VERIFIED.getState() + ""); Long toVerify = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setToVerify(toVerify+"");//待核实数 + overviewDTO.setToVerify(toVerify + "");//待核实数 countCondition.setCaseState(null); - countCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+""); - Long register = (Long)assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setRegister(register+"");//立案数 + countCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState() + ""); + Long register = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setRegister(register + "");//立案数 - countCondition.setEbCaseState(EbCaseStateEnum.NO_FILINGCASE.getState()+""); - Long invalid = (Long)assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setInvalid(invalid+"");//无效案卷数 - overviewDTO.setValidReportRate(getRate(register,report,df));//有效上报率 + countCondition.setEbCaseState(EbCaseStateEnum.NO_FILINGCASE.getState() + ""); + Long invalid = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setInvalid(invalid + "");//无效案卷数 + overviewDTO.setValidReportRate(getRate(register, report, df));//有效上报率 countCondition.setEbCaseState(null); countCondition.setProcessState("2");//处置完成 - Long process = (Long)assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setProcess(process+"");//处理数 - overviewDTO.setProRate(getRate(process,register,df));//处理率 + Long process = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setProcess(process + "");//处理数 + overviewDTO.setProRate(getRate(process, register, df));//处理率 countCondition.setIsProcessOvertime("0"); - Long proOntime= (Long)assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setProOntime(proOntime+"");//按期处理数 - overviewDTO.setProOntimeRate(getRate(proOntime,process,df));//按期处理率 + Long proOntime = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setProOntime(proOntime + "");//按期处理数 + overviewDTO.setProOntimeRate(getRate(proOntime, process, df));//按期处理率 countCondition.setProcessState(null); countCondition.setIsProcessOvertime(null); countCondition.setIsClose("1"); - Long close= (Long)assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setClose(close+"");//结案数 - overviewDTO.setCloseRate(getRate(close,register,df));//结案率 + Long close = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setClose(close + "");//结案数 + overviewDTO.setCloseRate(getRate(close, register, df));//结案率 countCondition.setIsCloseOvertime("0"); - Long closeOntime = (Long)assessFactorService.countByCountCondition(countCondition).get("num"); - overviewDTO.setCloseOntime(closeOntime+"");//按期结案数 - overviewDTO.setCloseOntimeRate(getRate(closeOntime,close,df));//按期结案率 + Long closeOntime = (Long) assessFactorService.countByCountCondition(countCondition).get("num"); + overviewDTO.setCloseOntime(closeOntime + "");//按期结案数 + overviewDTO.setCloseOntimeRate(getRate(closeOntime, close, df));//按期结案率 return overviewDTO; } //根据综合指标（分数）得到等级 - private String getGrade(String score){ - if("".equals(score)||score==null){ + private String getGrade(String score) { + if ("".equals(score) || score == null) { return "--"; } - String grade=""; + String grade = ""; Float s = Float.valueOf(score); - if(s>=90.0){ - grade="A"; - }else if(s<90.0&&s>=75.0){ - grade="B"; - }else if(s<75.0&&s>=60.0){ - grade="C"; - }else if(s<60.0&&s>=40.0){ - grade="D"; - }else { - grade="E"; + if (s >= 90.0) { + grade = "A"; + } else if (s < 90.0 && s >= 75.0) { + grade = "B"; + } else if (s < 75.0 && s >= 60.0) { + grade = "C"; + } else if (s < 60.0 && s >= 40.0) { + grade = "D"; + } else { + grade = "E"; } return grade; } //计算百分数 - private String getRate(Long fenzi,Long fenmu,DecimalFormat df){ - double rate=0.0; - if(fenmu>0) rate = (double) fenzi * 100 / fenmu; + private String getRate(Long fenzi, Long fenmu, DecimalFormat df) { + double rate = 0.0; + if (fenmu > 0) rate = (double) fenzi * 100 / fenmu; return (df.format(rate) + "%"); }