推

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -205,10 +205,22 @@ export default {
           <el-tag type={"success"} size="mini">
             {content}
           </el-tag>
-        ) : row.subAddType == 1 && column.label.includes("分值") ? (
-          <p>{content}</p>
-        ) : row.subAddType == 2 && column.label.includes("分值") ? (
-          <p>{-content}</p>
+        ) : row.checkStatus == 1 || row.processStatus == 1 ? (
+          row.subAddType == 1 && column.label.includes("分值") ? (
+            <el-link type={"info"}>(+{content})</el-link>
+          ) : row.subAddType == 2 && column.label.includes("分值") ? (
+            <el-link type={"info"}>({-content})</el-link>
+          ) : (
+            <p>{content}</p>
+          )
+        ) : row.checkStatus == 2 || row.processStatus == 2 ? (
+          row.subAddType == 1 && column.label.includes("分值") ? (
+            <el-link>+{content}</el-link>
+          ) : row.subAddType == 2 && column.label.includes("分值") ? (
+            <el-link>{-content}</el-link>
+          ) : (
+            <p>{content}</p>
+          )
         ) : (
           <p>{content}</p>
         )

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

@@ -69,6 +69,16 @@
               {{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
               {{ form.deductPerson ? form.deductPerson : "--" }}</el-col
             >
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12"
               >图片凭证：
 

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

@@ -83,6 +83,16 @@
 
               {{ form.deductTime ? form.deductTime : "--" }}</el-col
             >
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12"
               >图片凭证：
               <el-image

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

@@ -60,7 +60,15 @@
             >
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+            <el-col :span="12">
               图片凭证：
               <el-image
                 v-if="form.filePaths"

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

@@ -62,7 +62,15 @@
             >
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+            <el-col :span="12">
               图片凭证：
               <el-image
                 v-if="form.filePaths"

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

@@ -58,7 +58,15 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24"
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+            <el-col :span="12"
               >图片凭证：
               <el-image
                 v-if="form.filePaths"

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

@@ -63,6 +63,14 @@
           </el-row>
 
           <el-row>
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
             <el-col :span="12"
               >图片凭证：
               <el-image
@@ -414,6 +422,7 @@ export default {
       kaoqinCateArr: [],
       kaoqinArr: [],
       urls: { saveUrl: "/check/review/record/examine" }, //重写核查地址
+      baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
 

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/EffectSaveReq.java

@@ -27,4 +27,9 @@ public class EffectSaveReq extends BaseReq {
      * 报警时间
      */
     private Date alarmTime;
+
+    /**
+     * 窗口编号
+     */
+    private String windowNum;
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/ReviewSaveReq.java

@@ -28,6 +28,9 @@ public class ReviewSaveReq extends BaseReq {
      */
     private String reviewDevice;
 
-
+    /**
+     * 窗口编号
+     */
+    private String windowNum;
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java

@@ -219,7 +219,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
@@ -254,11 +254,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         recordEntity.setWorkNum(staffEntity.getWorkNum());
+        recordEntity.setWindowNum(req.getWindowNum());
         PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId());
         recordEntity.setCategoryName(categoryEntity == null ? "" : categoryEntity.getName());
         PerformReviewRecordEntity save = reviewRecordService.save(recordEntity);
@@ -285,7 +286,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
         recordEntity.setWorkNum(staffEntity.getWorkNum());
 
@@ -317,7 +318,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
 
         recordEntity.setWorkNum(staffEntity.getWorkNum());
@@ -350,10 +351,12 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setRuleName(rule.getName());
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
-        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
         recordEntity.setWorkNum(staffEntity.getWorkNum());
 
+        recordEntity.setWindowNum(req.getWindowNum());
+
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId());
@@ -384,7 +387,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setCategoryName(rule.getCategoryName());
         recordEntity.setWorkNum(staffEntity.getWorkNum());
 
-        recordEntity.setDeductPerson("admin");
+        recordEntity.setDeductPerson("系统管理员");
         recordEntity.setDeductTime(new Date());
 
         recordEntity.setCreateUserId(1L);

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/AppealApiController.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.xhx.busiz.h5.req.AppealReq;
@@ -29,6 +30,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.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -131,6 +133,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             query.setCreateTimeStart(appealReq.getApperalStartDate());
             query.setCreateTimeEnd(appealReq.getAppealEndDate());
             query.setStaffId(context.getUser().getCustomerId());
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
 
             Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context);
             model.put(KEY_RESULT_DATA, result.getList());

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/FeedbackApiController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.xhx.busiz.h5.req.FeedbackReq;
@@ -93,6 +94,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                     feedbackQuery.setIdList(feedbackIdList);
                     feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
                     feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
+                    feedbackQuery.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
                     Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
                     model.put(PAGEINFO_KEY, result.getPageInfo());
                     model.put(KEY_RESULT_DATA, result.getList());
@@ -113,6 +116,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
 
                     feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
                     feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
+                    feedbackQuery.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
 
                     Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
 
@@ -136,6 +140,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                         feedbackQuery.setIdList(unfinFeedbackList);
                         feedbackQuery.setCreateTimeStart(feedbackReq.getFeedBackStartDate());
                         feedbackQuery.setCreateTimeEnd(feedbackReq.getFeedBackEndDate());
+                        feedbackQuery.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
                         Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
                         model.put(PAGEINFO_KEY, result.getPageInfo());
                         model.put(KEY_RESULT_DATA, result.getList());

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/InspectApiController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.xhx.busiz.h5.req.InspectSaveReq;
@@ -164,6 +165,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
             query.setCreateTimeEnd(performReq.getPerformEndDate());
             query.setCreateUserId(context.getUser().getId());
             query.setSubMethod(SubMethodEnum.大厅巡查.getValue());
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
 
             log.info("inspect query:{}",JSONObject.toJSONString(query));
 

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.xhx.busiz.h5.req.PerformReq;
@@ -36,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.mortals.framework.ap.SysConstains.*;
@@ -182,6 +180,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
                 query.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
 
                 Result<CheckAllRecordVo> result = checkAllRecordService.getAllCheckRecord(query, pageInfo);
                 List<CheckAllRecordVo> allCheckRecord = result.getList();
@@ -202,6 +201,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
                 query.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
                 Result<CheckAttendRecordEntity> result = checkAttendRecordService.find(query, pageInfo, context);
                 List<PerformInfo> collect = result.getList().stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
@@ -222,6 +223,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
                 query.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
                 Result<CheckReviewRecordEntity> result = checkReviewRecordService.find(query, pageInfo, context);
                 List<PerformInfo> collect = result.getList().stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
@@ -242,6 +245,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
                 query.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
                 Result<CheckComplainRecordEntity> result = checkComplainRecordService.find(query, pageInfo, context);
                 List<PerformInfo> collect = result.getList().stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
@@ -262,6 +267,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
                 query.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
                 Result<CheckGoworkRecordEntity> result = checkGoworkRecordService.find(query, pageInfo, context);
                 List<PerformInfo> collect = result.getList().stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
@@ -282,6 +289,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 query.setCheckTimeEnd(performReq.getPerformEndDate());
                 query.setStaffId(context.getUser().getCustomerId());
                 query.setCheckStatus(CheckStatusEnum.已处理.getValue());
+                query.setOrderColList(Arrays.asList(new OrderCol("createTime",OrderCol.DESCENDING)));
+
                 Result<CheckEffectRecordEntity> result = checkEffectRecordService.find(query, pageInfo, context);
                 List<PerformInfo> collect = result.getList().stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAllRecordQuery.java

 package com.mortals.xhx.module.check.model;
 
+import com.mortals.framework.model.OrderCol;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class CheckAllRecordQuery {
     /**
@@ -34,5 +38,6 @@ public class CheckAllRecordQuery {
      */
     private Integer subAddType;
 
+    private transient List<OrderCol> orderColList = new ArrayList();
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java

@@ -130,9 +130,16 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             com.aliyun.dingtalkworkflow_1_0.Client client = createClient();
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders getProcessInstanceHeaders = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceHeaders();
             getProcessInstanceHeaders.xAcsDingtalkAccessToken = getToken();
+
+            getProcessInstanceHeaders.getCommonHeaders().put("host","172.15.28.113");
+            getProcessInstanceHeaders.getCommonHeaders().put("port","8918");
+            getProcessInstanceHeaders.getCommonHeaders().put("protocol","http");
+
             com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest getProcessInstanceRequest = new com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceRequest()
                     .setProcessInstanceId(processInstanceId);
 
+
+
             GetProcessInstanceResponse rsp = client.getProcessInstanceWithOptions(getProcessInstanceRequest, getProcessInstanceHeaders, new com.aliyun.teautil.models.RuntimeOptions());
             return Rest.ok("成功", rsp.getBody().getResult());
         } catch (Exception e) {

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAllRecordMapper.xml

@@ -74,6 +74,15 @@
         <if test="checkTimeEnd != null and checkTimeEnd!=''"> AND checkTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{checkTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') </if>
         <if test="createUserId != null and createUserId!=''"> AND createUserId = #{createUserId} </if>
         ) AS a
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+
     </select>
 
     <select id="getListCount" parameterType="com.mortals.xhx.module.check.model.CheckAllRecordQuery" resultType="int">