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

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/model/WindowWorkmanPerformDetailEntity.java

@@ -11,66 +11,82 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.window.model.vo.WindowWorkmanPerformDetailVo;
 import lombok.Data;
 /**
-* 窗口人员考核汇总明细实体对象
-*
-* @author zxfei
-* @date 2024-01-17
-*/
+ * 窗口人员考核汇总明细实体对象
+ *
+ * @author zxfei
+ * @date 2024-01-30
+ */
 @Data
 public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetailVo {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 人员考核汇总表主键
-    */
+     * 人员考核汇总表主键
+     */
     private Long performId;
     /**
-    * 工作人员id
-    */
+     * 工作人员id
+     */
     private Long staffId;
     /**
-    * 工作人员名称
-    */
+     * 工作人员名称
+     */
     private String staffName;
     /**
-    * 工作纪律得分
-    */
+     * 工作纪律得分
+     */
     private BigDecimal discipline;
     /**
-    * 服务规范得分
-    */
+     * 服务规范得分
+     */
     private BigDecimal specification;
     /**
-    * 综合管理得分
-    */
+     * 综合管理得分
+     */
     private BigDecimal management;
     /**
-    * 群众评议得分
-    */
+     * 群众评议得分
+     */
     private BigDecimal evaluation;
     /**
-    * 工作效能得分
-    */
+     * 工作效能得分
+     */
     private BigDecimal efficiency;
     /**
-    * 加分
-    */
+     * 加分
+     */
     private BigDecimal bonusScore;
     /**
-    * 合计得分
-    */
+     * 合计得分
+     */
     private BigDecimal sumScore;
     /**
-    * 考核等级1好2较好3一般4较差
-    */
+     * 考核等级1好2较好3一般4较差
+     */
     private Integer examineLevel;
     /**
-    * 备注
-    */
+     * 备注
+     */
     private String remark;
+    /**
+     * 所属部门id
+     */
+    private Long deptId;
+    /**
+     * 所属部门名称
+     */
+    private String deptName;
+    /**
+     * 所属大厅
+     */
+    private Long salaId;
+    /**
+     * 所属大厅名称
+     */
+    private String salaName;
     @Override
     public int hashCode() {
-         return this.getId().hashCode();
+        return this.getId().hashCode();
     }
     @Override
     public boolean equals(Object obj) {
@@ -78,24 +94,28 @@ public class WindowWorkmanPerformDetailEntity extends WindowWorkmanPerformDetail
         if (obj instanceof WindowWorkmanPerformDetailEntity) {
             WindowWorkmanPerformDetailEntity tmp = (WindowWorkmanPerformDetailEntity) obj;
             if (this.getId() == tmp.getId()) {
-                 return true;
+                return true;
             }
         }
         return false;
     }
 
     public void initAttrValue(){
-            this.performId = null;
-            this.staffId = null;
-            this.staffName = "";
-            this.discipline = BigDecimal.ZERO;
-            this.specification = BigDecimal.ZERO;
-            this.management = BigDecimal.ZERO;
-            this.evaluation = BigDecimal.ZERO;
-            this.efficiency = BigDecimal.ZERO;
-            this.bonusScore = BigDecimal.ZERO;
-            this.sumScore = BigDecimal.ZERO;
-            this.examineLevel = 0;
-            this.remark = "";
+        this.performId = null;
+        this.staffId = null;
+        this.staffName = "";
+        this.discipline = BigDecimal.ZERO;
+        this.specification = BigDecimal.ZERO;
+        this.management = BigDecimal.ZERO;
+        this.evaluation = BigDecimal.ZERO;
+        this.efficiency = BigDecimal.ZERO;
+        this.bonusScore = BigDecimal.ZERO;
+        this.sumScore = BigDecimal.ZERO;
+        this.examineLevel = 0;
+        this.remark = "";
+        this.deptId = null;
+        this.deptName = "";
+        this.salaId = null;
+        this.salaName = "";
     }
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.window.web;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.common.code.FillStatusEnum;
 import com.mortals.xhx.common.code.SelfLevelEnum;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 /**
@@ -50,6 +52,7 @@ public class WindowPerformController extends BaseCRUDJsonBodyMappingController<W
         JSONObject jsonObject = new JSONObject();
         String busiDesc = "查询所有汇总表" + this.getModuleDesc();
         try {
+            query.setOrderColList(Arrays.asList(new OrderCol("fillDate", OrderCol.DESCENDING)));
             Rest<List<WindowPerformAllVo>> allRest = this.service.getAllList(query, getContext());
             //   Rest<List<String>> performMonthRest = this.service.getPerformMonthList(getContext());
             if(YesNoEnum.YES.getValue()== allRest.getCode()){

attendance-performance-manager/src/main/resources/sqlmap/module/window/WindowWorkmanPerformMapper.xml

@@ -46,6 +46,10 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="deptId" column="deptId" />
+        <result property="deptName" column="deptName" />
+        <result property="salaId" column="salaId" />
+        <result property="salaName" column="salaName" />
     </resultMap>
 
 
@@ -120,7 +124,7 @@
     <!-- 子表所有列 -->
     <sql id="_columns_sub">
         <trim suffixOverrides="," suffix="">
-            b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
+            b.id,b.performId,b.staffId,b.staffName,b.discipline,b.specification,b.management,b.evaluation,b.efficiency,b.bonusScore,b.sumScore,b.examineLevel,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,b.deptId,b.deptName,b.salaId,b.salaName
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->

db/add.sql

@@ -1168,3 +1168,8 @@ CREATE TABLE mortals_xhx_perform_error_record(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='绩效异常记录信息';
+
+ALTER TABLE `mortals_xhx_window_workman_perform_detail` ADD COLUMN `deptId` bigint(20)  COMMENT '所属部门id' AFTER `staffName`,
+ADD COLUMN  `deptName` varchar(256) COMMENT '所属部门名称' AFTER `deptId`,
+ADD COLUMN  `salaId` bigint(20) COMMENT '所属大厅' AFTER `deptName`,
+ADD COLUMN  `salaName` varchar(128) COMMENT '所属大厅名称' AFTER `salaId`;
\ No newline at end of file