Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -183,8 +183,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -208,7 +208,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/complain/record/list.vue

@@ -184,8 +184,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -224,7 +224,7 @@ export default {
             prop: "complainTitle",
             formatter: this.formatter,
           },
-          
+
           {
             label: "投诉内容",
             prop: "complainContent",

attendance-performance-manager-ui/admin/src/views/check/effect/record/list.vue

@@ -184,8 +184,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
 
@@ -210,7 +210,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/gowork/record/list.vue

@@ -184,8 +184,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/check/other/record/list.vue

@@ -183,8 +183,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -208,7 +208,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/review/record/list.vue

@@ -183,8 +183,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -214,7 +214,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -86,8 +86,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -128,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -87,8 +87,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -129,7 +129,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -177,22 +177,22 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
-          {
-            name: "salaId",
-            type: "selectSalaId",
-            label: "大厅",
-            fuzzy: false,
-          },
           {
             name: "processStatus",
             type: "select",
             label: "处理状态",
             fuzzy: false,
           },
+          {
+            name: "salaId",
+            type: "selectSalaId",
+            label: "大厅",
+            fuzzy: false,
+          },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -215,7 +215,7 @@ export default {
           { label: "姓名", prop: "staffName", formatter: this.formatter },
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/perform/complain/record/list.vue

@@ -191,8 +191,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/effect/record/list.vue

@@ -192,8 +192,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
 
@@ -218,7 +218,7 @@ export default {
 
           { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
 

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/list.vue

@@ -191,8 +191,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/other/record/list.vue

@@ -191,8 +191,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -93,8 +93,8 @@ export default {
 
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
 
@@ -115,7 +115,7 @@ export default {
 
           { label: "手机号", prop: "phoneNumber", formatter: this.formatter },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           { label: "所属部门", prop: "deptName", formatter: this.formatter },
           {

attendance-performance-manager-ui/admin/src/views/window/perform/list.vue

@@ -88,8 +88,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/window/workman/perform/list.vue

@@ -86,8 +86,8 @@ export default {
           },
           {
             name: "deptId",
-            type: "select",
-            label: "所属部门",
+            type: "selectDeptId",
+            label: "部门",
             fuzzy: false,
           },
           {
@@ -128,7 +128,7 @@ export default {
             },
           },
 
-          { label: "所属大厅", prop: "salaName",formatter: this.formatter },
+          { label: "所属大厅", prop: "salaName", formatter: this.formatter },
 
           {
             label: "所属部门",

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java

@@ -261,7 +261,8 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());
@@ -436,13 +437,16 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         statEntity.setTotalScore(totalScore);
     }
 
-    private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){
+    private static void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){
         BigDecimal total = new BigDecimal(100);
         BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
         reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
+        if(otherScore.compareTo(BigDecimal.ZERO)==0){
+            otherScore = new BigDecimal(100);
+        }
         otherScore = otherScore.multiply(weightPdu.selfWeight());
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());
@@ -457,4 +461,21 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
         summary = summary.add(effectScore);
         staffPerformSummaryEntity.setTotalScore(summary);
     }
+
+    public static void main(String[] args) {
+        StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
+        staffPerformSummaryEntity.initAttrValue();
+        staffPerformSummaryEntity.setAttendScore(new BigDecimal(-0.4));
+        String ss = "{\"attendWeight\":10,\"effectWeight\":20,\"goworkWeight\":20,\"reviewWeight\":0,\"selfWeight\":50}";
+        WeightPdu weightPdu = JSONObject.parseObject(ss,WeightPdu.class);
+        System.out.println(JSONObject.toJSONString(weightPdu));
+//        BigDecimal total = new BigDecimal(100);
+//        BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
+//        System.out.println(reviewScore);
+//        reviewScore = reviewScore.multiply(weightPdu.attendWeight());
+//        System.out.println(weightPdu.reviewWeight());
+//        System.out.println(reviewScore);
+        computeSummary(staffPerformSummaryEntity,weightPdu);
+        System.out.println(JSONObject.toJSONString(staffPerformSummaryEntity));
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java

@@ -228,7 +228,8 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java

@@ -253,7 +253,8 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());
@@ -438,6 +439,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
+        if(otherScore.compareTo(BigDecimal.ZERO)==0){
+            otherScore = new BigDecimal(100);
+        }
         otherScore = otherScore.multiply(weightPdu.selfWeight());
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java

@@ -250,7 +250,8 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());
@@ -435,6 +436,9 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
+        if(otherScore.compareTo(BigDecimal.ZERO)==0){
+            otherScore = new BigDecimal(100);
+        }
         otherScore = otherScore.multiply(weightPdu.selfWeight());
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java

@@ -234,7 +234,8 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java

@@ -255,7 +255,8 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());
@@ -440,6 +441,9 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
+        if(otherScore.compareTo(BigDecimal.ZERO)==0){
+            otherScore = new BigDecimal(100);
+        }
         otherScore = otherScore.multiply(weightPdu.selfWeight());
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckWindowWorkmanPerformServiceImpl.java

@@ -127,7 +127,8 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro = erro.add(staffPerformSummaryEntity.getAttendScore());
-                    //erro = erro.add(staffPerformSummaryEntity.getOtherScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    erro = erro.add(Score100.subtract(staffPerformSummaryEntity.getOtherScore()));
                     erro = erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro = erro.add(staffPerformSummaryEntity.getEffectScore());
                     erro = erro.add(staffPerformSummaryEntity.getComplainScore());
@@ -145,7 +146,8 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
                     staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setComplainScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
+                    BigDecimal Score100 = new BigDecimal(100);
+                    staffPerformSummaryEntity.setErrorScore(Score100.subtract(vo.getSumScore()));
                     computeSummary(staffPerformSummaryEntity,weightPdu);
                     staffPerformSummaryEntity.setCreateUserId(1l);
                     staffPerformSummaryEntity.setCreateTime(new Date());
@@ -164,6 +166,9 @@ public class CheckWindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImp
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
+        if(otherScore.compareTo(BigDecimal.ZERO)==0){
+            otherScore = new BigDecimal(100);
+        }
         otherScore = otherScore.multiply(weightPdu.selfWeight());
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckWindowWorkmanPerformMapperExt.xml

@@ -5,7 +5,7 @@
     <!-- 汇总已审核的核查记录 -->
     <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery" resultType="com.mortals.xhx.module.check.model.vo.StaffCheckSummaryVo">
         SELECT
-        p.`year`,p.`month`,d.staffId,d.staffName,s.deptId,s.deptName,sum(d.sumScore) as sumScore
+        p.`year`,p.`month`,d.staffId,d.staffName,s.salaId,s.salaName,s.deptId,s.deptName,sum(d.sumScore) as sumScore
         FROM
         mortals_xhx_check_window_workman_perform p,
         mortals_xhx_window_workman_perform w,
@@ -20,7 +20,7 @@
         <if test="recordId != null and recordId!=''"> AND p.recordId = #{recordId} </if>
         <if test="year != null and year!=''"> AND p.`year` = #{year} </if>
         <if test="month != null and month!=''"> AND p.`month` = #{month} </if>
-        GROUP BY p.`year`,p.`month`,d.staffId,d.staffName,s.deptId,s.deptName
+        GROUP BY p.`year`,p.`month`,d.staffId,d.staffName,s.salaId,s.salaName,s.deptId,s.deptName
     </select>
 
 </mapper>
\ No newline at end of file