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

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -73,7 +73,8 @@
                             </el-date-picker>
                         </el-form-item>
                         <el-form-item label="邀请人员：" label-width="125px">
-                            <el-button size="small" type="success" @click="treeDialog = 1">选择人员</el-button>
+                            <el-button size="small" type="success" @click="treeDialog = 1">{{
+                                checkedUser.length > 0 ? `已选择 ${checkedUser.length} 人` : '选择人员 + ' }}</el-button>
                         </el-form-item>
                         <div style="text-align: center;">
                             <el-button size="small" @click="issueDialog = false">取消</el-button>
@@ -185,7 +186,7 @@ export default {
             editStyle: false,
             loadingstate: false,
             ImgUrl: process.env.VUE_APP_API_BASE_URL,
-            showImgUrl:'',
+            showImgUrl: '',
             coverImg: [],
 
             weblink: 0,
@@ -199,11 +200,11 @@ export default {
             }
         }
     },
-    created(){
-        if(process.env.NODE_ENV == "development"){
-            this.showImgUrl= process.env.VUE_APP_API_BASE_URL
-        }else{
-            this.showImgUrl=''
+    created() {
+        if (process.env.NODE_ENV == "development") {
+            this.showImgUrl = process.env.VUE_APP_API_BASE_URL
+        } else {
+            this.showImgUrl = ''
         }
     },
     mounted() {

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

@@ -96,27 +96,25 @@ export default {
             },
           },
 
-          { label: "考勤绩效指标分数", prop: "attendScore", formatter: this.formatter },
+          { label: "考勤绩效指标分数", prop: "attendScore",  },
 
-          { label: "评价绩效指标分数", prop: "reviewScore", formatter: this.formatter },
-          { label: "投诉绩效指标分数", prop: "reviewScore", formatter: this.formatter },
+          { label: "评价绩效指标分数", prop: "reviewScore", },
+          { label: "投诉绩效指标分数", prop: "complainScore", },
 
-          { label: "办件绩效分数", prop: "workScore", formatter: this.formatter },
+          { label: "办件绩效分数", prop: "goworkScore",  },
 
-          { label: "效能绩效分数", prop: "effectScore", formatter: this.formatter },
+          { label: "效能绩效分数", prop: "effectScore", },
 
-          { label: "其它绩效分数", prop: "otherScore", formatter: this.formatter },
+          { label: "其它绩效分数", prop: "otherScore", },
 
           {
             label: "累计异常分数",
             prop: "errorScore",
-            formatter: this.formatter,
           },
 
           {
             label: "本月得分数",
             prop: "totalScore",
-            formatter: this.formatter,
           },
           { label: "年", prop: "year", formatter: this.formatter },
           { label: "月", prop: "month", formatter: this.formatter },

attendance-performance-manager-ui/admin/src/views/window/owner/drawershow.vue

@@ -9,17 +9,13 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <Field
-          label="部门id号"
+          label="部门"
           prop="deptId"
+          type="select"
           v-model="form.deptId"
           placeholder="请输入部门id号"
         />
-        <Field
-          label="部门名称"
-          prop="deptName"
-          v-model="form.deptName"
-          placeholder="请输入部门名称"
-        />
+
         <Field
           label="姓名"
           prop="name"

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -305,7 +305,6 @@ public class DingMessageController {
                                 if(leaveRecordsResponseBodyResultRest.getCode() == Rest.SUCCESS){
                                     OapiAttendanceVacationQuotaListResponse.OapiLeaveQuotaUserListVo result1 = leaveRecordsResponseBodyResultRest.getData();
                                     double leaveBlance = 0;
-                                    DecimalFormat format = new DecimalFormat("##.##");
                                     //如果钉钉有假期余额就写入钉钉返回的余额   否则用数据库表数据减去当前请假的天数
                                     if(result1.getLeaveQuotas() != null && result1.getLeaveQuotas().size() > 0){
                                         leaveBlance = (result1.getLeaveQuotas().get(0).getQuotaNumPerDay() - result1.getLeaveQuotas().get(0).getUsedNumPerDay())/100;
@@ -525,6 +524,8 @@ public class DingMessageController {
                                     }
                                 }
 
+                                //审批状态为同意过后再修改假期余额
+                                if(result.getResult().compareToIgnoreCase("AGREE") == 0){
                                     //更新假期余额表
                                     if(ObjectUtils.isEmpty(balanceEntity)){
                                         attendanceVacationBalanceEntity.setCreateUserId(1L);
@@ -538,6 +539,8 @@ public class DingMessageController {
                                         attendanceVacationBalanceEntity.setUpdateTime(new Date());
                                         balanceService.update(attendanceVacationBalanceEntity);
                                     }
+                                }
+
 
 
                             }else {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java

@@ -76,7 +76,7 @@ public class StaffEntity extends StaffVo {
     /**
      * 员工类型（1.全职,2.兼职,3.实习)
      */
-    @Excel(name = "员工类型")
+    @Excel(name = "员工类型", readConverterExp = "1=全职,2=兼职,3=实习")
     private Integer staffType;
     /**
      * 员工状态(1.正式,2.试用,3.离职)

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffPerformSummaryVo.java

@@ -15,5 +15,8 @@ import java.util.Date;
 */
 @Data
 public class StaffPerformSummaryVo extends BaseEntityLong {
-
+    /**
+     * 联系电话
+     */
+    private String phoneNumber;
 }
\ No newline at end of file

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;
@@ -7,6 +12,9 @@ import com.mortals.xhx.module.staff.dao.StaffPerformSummaryDao;
 import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
 import com.mortals.xhx.module.staff.service.StaffPerformSummaryService;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
 /**
 * StaffPerformSummaryService
 * 员工绩效统计 service实现
@@ -18,4 +26,19 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<StaffPerformSummaryDao, StaffPerformSummaryEntity, Long> implements StaffPerformSummaryService {
 
+    @Autowired
+    private StaffService staffService;
+
+    @Override
+    protected void findAfter(StaffPerformSummaryEntity params, PageInfo pageInfo, Context context, List<StaffPerformSummaryEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for(StaffPerformSummaryEntity item:list) {
+                StaffEntity staffEntity = staffService.get(item.getStaffId());
+                if(staffEntity!=null){
+                    item.setWorkNum(staffEntity.getWorkNum());
+                    item.setPhoneNumber(staffEntity.getPhoneNumber());
+                }
+            }
+        }
+    }
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerController.java

@@ -4,6 +4,8 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -47,6 +49,8 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
     private ParamService paramService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private DeptService deptService;
 
     public WindowOwnerController() {
         super.setModuleDesc("窗口负责人");
@@ -55,11 +59,10 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
     @Override
     protected void init(Map<String, Object> model, Context context) {
 
-
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
-
         this.addDict(model, "updateUserId", collect);
+        this.addDict(model, "deptName", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
 
         super.init(model, context);
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -60,7 +60,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     @Override
     protected void saveBefore(WorkmanEntity entity, Map<String, Object> model, Context context) throws AppException {
 
-        if(ObjectUtils.isEmpty(entity.getDeptId())){
+        if(!ObjectUtils.isEmpty(entity.getDeptId())){
             DeptEntity deptEntity = deptService.get(entity.getDeptId(), context);
             entity.setDeptName(deptEntity==null?"":deptEntity.getDeptName());
         }