Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

@@ -27,9 +27,12 @@
                 <div class="user-info">
                     <span class="user-i">核查时间：{{momentVal(item.checkTime)}}</span>
                 </div>
+                <div class="user-info" v-if="item.auditStatus==2">
+                    <span class="user-i">核查结果：{{item.subAddType==1?'+':'-'}}{{item.score}}（{{item.checkResult}}）</span>
+                </div>
             </div>
             <div class="user-right">
-                <div class="n">{{item.subAddType==1?'+':'-'}}{{item.score}}</div>
+                <div class="n">{{item.subAddType==1?'+':'-'}}{{item.auditStatus==2?0:item.score}}</div>
             </div>
         </div>
         <!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffPerformSummaryServiceImpl.java

 package com.mortals.xhx.module.staff.service.impl;
-import com.mortals.framework.model.PageInfo;
-import com.mortals.xhx.module.staff.model.StaffEntity;
-import com.mortals.xhx.module.staff.service.StaffService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.staff.dao.StaffPerformSummaryDao;
+import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
 import com.mortals.xhx.module.staff.service.StaffPerformSummaryService;
+import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.List;
 
 /**
@@ -29,6 +31,20 @@ public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<Staf
     @Autowired
     private StaffService staffService;
 
+    @Override
+    protected StaffPerformSummaryEntity findBefore(StaffPerformSummaryEntity params, PageInfo pageInfo, Context context) throws AppException {
+        Calendar calendar = Calendar.getInstance();
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH) + 1;
+        if(params.getYear()==null){
+            params.setYear(year);
+        }
+        if(params.getMonth()==null){
+            params.setMonth(month);
+        }
+        return params;
+    }
+
     @Override
     protected void findAfter(StaffPerformSummaryEntity params, PageInfo pageInfo, Context context, List<StaffPerformSummaryEntity> list) throws AppException {
         if(CollectionUtils.isNotEmpty(list)){