Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/router.js

@@ -37,6 +37,7 @@ const router = new Router({
         ...restBuilder("user", "system/user"), // 用户管理 -- 管理用户
         ...restBuilder("param", "system/param"), // 系统管理--参数管理
         ...restBuilder("task", "system/task"), // 系统管理--任务管理
+        ...restBuilder("parameter", "parameter"), // 系统管理--任务管理
         // 绩效负责人
         ...restBuilder("workman", "workman"),
         ...restBuilder("holiday", "holiday"),

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

@@ -129,7 +129,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 
@@ -150,6 +155,7 @@ export default {
                   noAdd
                   noDel
                   noEdit
+                  noView
                   reCheck
                   text={"自评核查"}
                   row={row}

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

@@ -80,7 +80,7 @@
               </el-table-column>
               <el-table-column
                 prop="examineLevel"
-                label="建议考核等级"
+                label="建议考核等次"
                 align="center"
                 width="200"
               >

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

@@ -130,7 +130,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 
@@ -159,6 +164,7 @@ export default {
                   noDel
                   noEdit
                   reCheck
+                  noView
                   text={"自评核查"}
                   row={row}
                   onEdit={this.toEdit}

attendance-performance-manager-ui/admin/src/views/parameter/view.vue

+<template>
+    <div class="layout">
+        <div class="page">
+            <div class="form-box">
+                <div>
+                    <h2 style="text-align: center;padding-bottom: 40px;">累计权重：<span style="color: red;">100%</span></h2>
+                    <el-form ref="form" :model="form" label-width="80px">
+                        <el-form-item label="自评权重">
+                            <el-input v-model.number="form.selfWeight">
+                                <template slot="append">%</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="考勤权重">
+                            <el-input v-model.number="form.attendWeight">
+                                <template slot="append">%</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="效能权重">
+                            <el-input v-model.number="form.effectWeight">
+                                <template slot="append">%</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="办件权重">
+                            <el-input v-model.number="form.goworkWeight">
+                                <template slot="append">%</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="评价权重">
+                            <el-input v-model.number="form.reviewWeight">
+                                <template slot="append">%</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item style="text-align: center;">
+                            <el-button type="primary" @click="onSubmit">立即保存</el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<style lang="less" scoped>
+.form-box{
+    width: 700px;
+    margin: 0 auto;
+    padding-top: 10vh;
+    &>div{
+        background-color: rgba(246, 246, 246, 1);
+        padding: 20px;
+    }
+}
+</style>
+<script>
+export default {
+    data(){
+        return {
+            form:{
+                selfWeight:0,
+                attendWeight:0,
+                effectWeight:0,
+                goworkWeight:0,
+                reviewWeight:0,
+            }
+        }
+    },
+    created() {
+        this.onView()
+    },
+    methods: {
+        //提交
+        onSubmit(){
+            const form = {...this.form}
+            let num = 0
+            for (const iterator in form) {
+                num = form[iterator] + num
+            }
+            if(num != 100){
+                this.$message.error(`权重比例${num}%，请检查是否正确`);
+                return
+            }
+            this.$post("/param/save",{paramKey:'weight',paramValue:JSON.stringify(this.form)}).then(res=>{
+                const {code,msg} = res
+                if(code == 1){
+                    this.$message.success('保存成功');
+                }else{
+                    this.$message.error(msg);
+                }
+            })
+        },
+        //查询
+        onView(){
+            this.$post("/param/key?key=weight").then(res=>{
+                const {code,data} = res
+                if(code == 1){
+                    this.form = JSON.parse(data)
+                }
+                
+            })
+        }
+    },
+}
+</script>
\ No newline at end of file

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

@@ -131,7 +131,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 

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

@@ -80,7 +80,7 @@
               </el-table-column>
               <el-table-column
                 prop="examineLevel"
-                label="建议考核等级"
+                label="建议考核等次"
                 align="center"
                 width="200"
               >

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

@@ -68,9 +68,7 @@ export default {
     },
     // 切换表格
     changeRadio() {
-      this.radio1 == 1
-        ? this.$router.push("/window/perform/list?page=1")
-        : "";
+      this.radio1 == 1 ? this.$router.push("/window/perform/list?page=1") : "";
     },
   },
   data() {
@@ -131,7 +129,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/param/service/ParamService.java

@@ -25,6 +25,8 @@ public interface ParamService extends ICRUDCacheService<ParamEntity, Long>, IPar
 	 */
     String getValueByKey(String key);
 
+	Long getIdByKey(String key);
+
 	/**
 	 * 通过firstOrganize获取配置参数key-value
 	 *

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/param/service/impl/ParamServiceImpl.java

@@ -39,6 +39,13 @@ public class ParamServiceImpl extends AbstractCRUDCacheServiceImpl<ParamDao, Par
         return keyValueMap.getOrDefault(key, "");
     }
 
+    @Override
+    public Long getIdByKey(String key) {
+        List<ParamEntity> list = this.getCacheList();
+        Map<String, Long> keyValueMap = list.parallelStream().collect(Collectors.toMap(x -> x.getParamKey(), y -> y.getId(), (o, n) -> n));
+        return keyValueMap.get(key);
+    }
+
     @Override
     public Map<String, String> getParamByFirstOrganize(String firstOrganize, String... excludeParamKeys) {
         List<ParamEntity> list = this.getCacheList();

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/param/web/ParamController.java

@@ -3,15 +3,16 @@ package com.mortals.xhx.base.system.param.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.RepeatSubmit;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.code.PageDisplayType;
 import com.mortals.framework.model.Context;
 
 import com.mortals.framework.util.FileUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.pdu.WeightPdu;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 
 import com.mortals.framework.web.BaseCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
@@ -24,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_WEIGHT;
+
 /**
  * 参数信息
  *
@@ -59,6 +62,32 @@ public class ParamController extends BaseCRUDJsonBodyMappingController<ParamServ
         return result;
     }
 
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "key")
+    @UnAuth
+    public String getValueByKey(@RequestParam(name = "key") String key) {
+        JSONObject jsonObject = new JSONObject();
+        String busiDesc = "通过key查询参数值" + this.getModuleDesc();
+        try {
+            String value = this.service.getValueByKey(key);
+            if (ObjectUtils.isEmpty(value) && key.equals(SYS_PARAM_WEIGHT)) {
+                WeightPdu weightPdu = new WeightPdu();
+                value = JSONObject.toJSONString(weightPdu);
+            }
+            Long id = this.service.getIdByKey(key);
+            jsonObject.put(KEY_RESULT_DATA, value);
+            jsonObject.put("id", id);
+            recordSysLog(request, busiDesc + " 【成功】");
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功！");
+        } catch (Exception e) {
+            log.error("获取异常", e);
+            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+        }
+        return jsonObject.toJSONString();
+    }
+
     public static void main(String[] args) {
         FileUtil.delete("E:\\pic\\1.png");
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/Constant.java

@@ -114,4 +114,5 @@ public final class Constant {
 
 	public static final String DISTRIBUTE_PATH = "distribute_path";
 
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/common/key/ParamKey.java

@@ -25,4 +25,6 @@ public class ParamKey {
 
     public static String SYS_PARAM_USER_URL = "user_url";
 
+    public static String SYS_PARAM_WEIGHT = "weight";
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/common/pdu/WeightPdu.java

+package com.mortals.xhx.common.pdu;
+
+import lombok.Data;
+
+/**
+ * 权重pdu
+ */
+@Data
+public class WeightPdu {
+
+    /**
+     * 自评权重
+     */
+    private Integer selfWeight=20;
+
+    /**
+     * 考勤权重
+     */
+    private Integer attendWeight=20;
+
+    /**
+     * 效能权重
+     */
+    private Integer effectWeight=20;
+
+    /**
+     * 办件权重
+     */
+    private Integer goworkWeight=20;
+
+    /**
+     * 评价权重
+     */
+    private Integer reviewWeight=20;
+
+
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowOwnerServiceImpl.java

@@ -133,8 +133,6 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                     StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(mobile));
                     if (!ObjectUtils.isEmpty(staffEntity)) {
                         return staffEntity;
-                    } else {
-
                     }
                     return getStaffEntityByName(name);
                 } else if (!ObjectUtils.isEmpty(name)) {
@@ -146,6 +144,8 @@ public class WindowOwnerServiceImpl extends AbstractCRUDServiceImpl<WindowOwnerD
                 }
             }).collect(Collectors.toList());
             return Rest.ok(staffEntityList);
+        }else{
+
         }
         return Rest.fail("获取窗口工作人员失败");
     }