Merge remote-tracking branch 'origin/master'

# Conflicts:
#	attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue

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

@@ -92,7 +92,6 @@ export default {
             name: "leaveType",
             type: "select",
             label: "请假类型",
-            fuzzy: false,
           },
           {
             name: "startTime",
@@ -141,7 +140,19 @@ export default {
 
           /*          {label: "处理状态", prop: "processStatus", formatter: this.formatter},*/
 
-          { label: "状态", prop: "auditResult", formatter: this.formatter },
+          {
+            label: "状态",
+            prop: "auditResult",
+            formatter: (row) => {
+              return row.processStatus
+                ? row.processStatus == 1
+                  ? "审核中"
+                  : row.auditResult == 1
+                  ? "通过"
+                  : "不通过"
+                : "--";
+            },
+          },
           { label: "审批负责人", prop: "approver" },
 
           {

attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue

@@ -69,7 +69,7 @@ export default {
           {
             name: "deptId",
             type: "select",
-            label: "全部部门"
+            label: "全部部门",
           },
           {
             name: "staffName",

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

@@ -121,7 +121,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -138,7 +142,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -431,6 +435,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -511,7 +518,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.form.view = "核查";
 
           this.$post("/perform/rules/list", {

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

@@ -132,7 +132,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -149,7 +153,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -461,7 +465,9 @@ export default {
           { required: true, message: "请输入员工姓名", trigger: "blur" },
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
-        createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -539,7 +545,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

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

@@ -107,7 +107,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -124,7 +128,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -431,6 +435,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -510,7 +517,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

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

@@ -338,7 +338,7 @@ export default {
                   noEdit
                   reCheck
                   noView
-                  text={"效能核查"}
+                  text={"监察绩效核查"}
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -109,7 +109,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -126,7 +130,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -426,6 +430,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -503,7 +510,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

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

@@ -24,7 +24,12 @@
             >
             <el-col :span="12"
               >违规类型：{{
-                form.irregularOtherType ? form.irregularOtherType : "--"
+                form.irregularOtherType
+                  ? util_formatter(
+                      "irregularOtherType",
+                      form.irregularOtherType
+                    )
+                  : "--"
               }}</el-col
             >
           </el-row>
@@ -105,7 +110,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                prop="checkResult"
+                v-if="form.subAddType == 1"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -122,7 +131,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -423,6 +432,9 @@ export default {
           { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
+        ],
       },
       form: {},
       kaoqinCateArr: [],
@@ -502,7 +514,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,

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

@@ -304,7 +304,7 @@ export default {
                   noEdit
                   reCheck
                   noView
-                  text={"其他核查"}
+                  text={"绩效核查"}
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

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

@@ -24,7 +24,9 @@
             >
             <el-col :span="12"
               >评价结果：{{
-                form.reviewResult ? form.reviewResult : "--"
+                form.reviewResult
+                  ? util_formatter("reviewResult", form.reviewResult)
+                  : "--"
               }}</el-col
             >
           </el-row>
@@ -110,7 +112,11 @@
         <div class="content">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-              <el-form-item label="核查结果：" v-if="form.subAddType == 1">
+              <el-form-item
+                label="核查结果："
+                v-if="form.subAddType == 1"
+                prop="checkResult"
+              >
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -127,7 +133,7 @@
                   >
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="核查结果：" v-else>
+              <el-form-item label="核查结果：" prop="checkResult" v-else>
                 <p v-if="form.view == '查看'">
                   {{ form.checkResult }}
                 </p>
@@ -149,6 +155,7 @@
               <el-row>
                 <el-form-item
                   :label="form.view == '查看' ? '绩效规则：' : '修改规则：'"
+                  prop="categoryId"
                 >
                   <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
                   <div v-else>
@@ -187,6 +194,7 @@
               <el-row>
                 <el-form-item
                   :label="form.subAddType == 1 ? '加分分值：' : '扣分分值：'"
+                  prop="score"
                 >
                   <p v-if="form.view == '查看'">
                     {{ form.subAddType == 1 ? "+" : "-"
@@ -199,7 +207,7 @@
               </el-row>
             </div>
             <el-row>
-              <el-form-item label="说明：">
+              <el-form-item label="说明：" prop="checkDesc">
                 <p v-if="form.view == '查看'">{{ form.checkDesc }}</p>
                 <el-input
                   v-else
@@ -209,12 +217,12 @@
               </el-form-item>
             </el-row>
             <el-row v-if="form.view == '查看'">
-              <el-form-item label="核查人员：">
+              <el-form-item label="核查人员：" prop="checkPerson">
                 <p>{{ form.checkPerson ? form.checkPerson : "--" }}</p>
               </el-form-item>
             </el-row>
             <el-row v-if="form.view == '查看'">
-              <el-form-item label="核查时间：">
+              <el-form-item label="核查时间：" prop="checkTime">
                 <p>{{ form.checkTime ? form.checkTime : "--" }}</p>
               </el-form-item>
             </el-row>
@@ -424,13 +432,10 @@ export default {
       toDate: ["reviewTime", "deductTime", "checkTime"],
       // 表单校验
       rules: {
-        staffName: [
-          { required: true, message: "请输入员工姓名", trigger: "blur" },
-          { max: 64, message: "最多只能录入64个字符", trigger: "blur" },
+        checkResult: [
+          { required: true, message: "请选择核查结果", trigger: "change" },
         ],
-        createTime: [{ required: true, message: "请选择创建时间" }],
       },
-      form: {},
       kaoqinCateArr: [],
       kaoqinArr: [],
       urls: { saveUrl: "/check/review/record/examine" }, //重写核查地址
@@ -504,7 +509,6 @@ export default {
               ? (this.form[key] = timestampToTime(this.form[key], 6))
               : "";
           }
-          this.form.checkResult = 1;
           this.$post("/perform/rules/list", {
             page: 1,
             size: -1,
@@ -562,7 +566,6 @@ export default {
               : "";
           }
           this.form.view = "查看";
-          console.log(this.form);
           this.open = true;
         }
       );

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/perform/gowork/record/drawershow.vue

@@ -68,8 +68,8 @@
         <el-col :span="22">
           <el-form-item label="办件编码：">
             <p v-if="form.view == '查看'">{{ form.goworkCode }}</p>
-
             <el-input
+              v-else
               v-model="form.goworkCode"
               placeholder="请输入办件编码"
             ></el-input>
@@ -479,7 +479,7 @@ export default {
       this.query = { id: row.id };
       // this.urls.currUrl = "perform/gowork/record/edit";
       // this.getData();
-      this.$get("/perform/review/record/info", { id: row.id }).then((res) => {
+      this.$get("/perform/gowork/record/info", { id: row.id }).then((res) => {
         console.log(res.data);
         if (res.code == 1) {
           this.form = res.data;
@@ -503,7 +503,7 @@ export default {
             ? (this.form[key] = timestampToTime(this.form[key], 6))
             : key == "goOffTimeStr"
             ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "reviewTime"
+            : key == "goworkTime"
             ? (this.form[key] = timestampToTime(this.form[key], 6))
             : "";
         }
@@ -537,7 +537,7 @@ export default {
       this.query = { id: row.id };
       // this.urls.currUrl = "perform/gowork/record/view";
       // this.getData();
-      this.$get("/perform/review/record/info", { id: row.id }).then((res) => {
+      this.$get("/perform/gowork/record/info", { id: row.id }).then((res) => {
         if (res.code == 1) {
           this.form = res.data;
         } else {

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

@@ -69,7 +69,6 @@
         <el-col :span="22">
           <el-form-item label="发生时间：">
             <p v-if="form.view == '查看'">{{ form.happenTime }}</p>
-
             <el-date-picker
               v-else
               v-model="form.happenTime"
@@ -462,7 +461,7 @@ export default {
             ? (this.form[key] = timestampToTime(this.form[key], 6))
             : key == "goOffTimeStr"
             ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "reviewTime"
+            : key == "happenTime"
             ? (this.form[key] = timestampToTime(this.form[key], 6))
             : "";
         }
@@ -520,7 +519,7 @@ export default {
             ? (this.form[key] = timestampToTime(this.form[key], 6))
             : key == "goOffTimeStr"
             ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "reviewTime"
+            : key == "happenTime"
             ? (this.form[key] = timestampToTime(this.form[key], 6))
             : "";
         }

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/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,21 +524,25 @@ public class DingMessageController {
                                     }
                                 }
 
-                                //更新假期余额表
-                                if(ObjectUtils.isEmpty(balanceEntity)){
-                                    attendanceVacationBalanceEntity.setCreateUserId(1L);
-                                    attendanceVacationBalanceEntity.setCreateTime(new Date());
-                                    balanceService.save(attendanceVacationBalanceEntity);
-                                }else{
-                                    //更新对象必须传入id
-                                    attendanceVacationBalanceEntity.setId(balanceEntity.getId());
-
-                                    attendanceVacationBalanceEntity.setUpdateUserId(1L);
-                                    attendanceVacationBalanceEntity.setUpdateTime(new Date());
-                                    balanceService.update(attendanceVacationBalanceEntity);
+                                //审批状态为同意过后再修改假期余额
+                                if(result.getResult().compareToIgnoreCase("AGREE") == 0){
+                                    //更新假期余额表
+                                    if(ObjectUtils.isEmpty(balanceEntity)){
+                                        attendanceVacationBalanceEntity.setCreateUserId(1L);
+                                        attendanceVacationBalanceEntity.setCreateTime(new Date());
+                                        balanceService.save(attendanceVacationBalanceEntity);
+                                    }else{
+                                        //更新对象必须传入id
+                                        attendanceVacationBalanceEntity.setId(balanceEntity.getId());
+
+                                        attendanceVacationBalanceEntity.setUpdateUserId(1L);
+                                        attendanceVacationBalanceEntity.setUpdateTime(new Date());
+                                        balanceService.update(attendanceVacationBalanceEntity);
+                                    }
                                 }
 
 
+
                             }else {
                                 log.info("该号码("+mobile +")未在本系统绑定");
                             }

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 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;
+
 /**
 * StaffPerformSummaryService
 * 员工绩效统计 service实现
@@ -18,4 +28,33 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<StaffPerformSummaryDao, StaffPerformSummaryEntity, Long> implements StaffPerformSummaryService {
 
+    @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)){
+            for(StaffPerformSummaryEntity item:list) {
+                StaffEntity staffEntity = staffService.get(item.getStaffId());
+                if(staffEntity!=null){
+                    item.setWorkNum(staffEntity.getWorkNum());
+                    item.setPhoneNumber(staffEntity.getPhoneNumber());
+                }
+            }
+        }
+    }
 }