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 d3df637..bb76e88 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 @@ -1233,6 +1233,8 @@ 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); //区域列表 EntityWrapper entityWrapper=new EntityWrapper(); @@ -1271,7 +1273,8 @@ 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("%",""));//公众举报分值 @@ -1293,7 +1296,15 @@ double closeScore = Double.valueOf(areaDTO.getCloseRate().replace("%",""));// 结案率分值 double closeOntimeScore = Double.valueOf(overviewDTO.getCloseOntimeRate().replace("%",""));// 按期结案率分值 double proOntimeScore = Double.valueOf(overviewDTO.getProOntimeRate().replace("%",""));// 按期处置率分值 - score = df.format(publicReportScore*0.1 + registerScore * 0.3 + closeScore * 0.2 + closeOntimeScore * 0.3 + proOntimeScore * 0.1); + + 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); + areaDTO.setScore(score); //等级 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 d3df637..bb76e88 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 @@ -1233,6 +1233,8 @@ 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); //区域列表 EntityWrapper entityWrapper=new EntityWrapper(); @@ -1271,7 +1273,8 @@ 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("%",""));//公众举报分值 @@ -1293,7 +1296,15 @@ double closeScore = Double.valueOf(areaDTO.getCloseRate().replace("%",""));// 结案率分值 double closeOntimeScore = Double.valueOf(overviewDTO.getCloseOntimeRate().replace("%",""));// 按期结案率分值 double proOntimeScore = Double.valueOf(overviewDTO.getProOntimeRate().replace("%",""));// 按期处置率分值 - score = df.format(publicReportScore*0.1 + registerScore * 0.3 + closeScore * 0.2 + closeOntimeScore * 0.3 + proOntimeScore * 0.1); + + 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); + areaDTO.setScore(score); //等级 diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/model/AssessFactor.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/model/AssessFactor.java index 5e7da77..5baddbf 100644 --- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/model/AssessFactor.java +++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/model/AssessFactor.java @@ -94,7 +94,34 @@ @TableField("ADJUST_ONTIME") private Integer adjustOntime; + /** + * ----------------------区域考核因子-------------------------- + * 公众举报 调节因子 + */ + @TableField("PUBLIC_REPORT") + private Integer publicReportFactor; + /** + * 立案数 调节因子 + */ + @TableField("REGISTER_Factor") + private Integer registerFactor; + /** + * 结案率 调节因子 + */ + @TableField("CLOSE_Factor") + private Integer closeFactor; + /** + * 按期结案 调节因子 + */ + @TableField("CLOSE_ONTIME_Factor") + private Integer closeOntimeFactor; + + /** + * 按期处置 调节因子 + */ + @TableField("PRO_ONTIME_Factor") + private Integer proOntimeFactor; @Override protected Serializable pkVal() { return this.id;