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

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

@@ -190,7 +190,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

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

@@ -12,7 +12,7 @@
           <el-form-item label="姓名：">
             <p v-if="form.view == '查看'">{{ form.staffName }}</p>
             <el-select
-              v-model="form.staffName"
+              v-model="form.staffId"
               filterable
               @change="staffChange"
               style="width: 100%;"
@@ -162,6 +162,7 @@
               v-else
               v-model="form.complainTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -242,7 +243,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

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

@@ -12,7 +12,7 @@
           <el-form-item label="姓名：">
             <p v-if="form.view == '查看'">{{ form.staffName }}</p>
             <el-select
-              v-model="form.staffName"
+              v-model="form.staffId"
               filterable
               @change="staffChange"
               style="width: 100%;"
@@ -108,6 +108,7 @@
               v-else
               v-model="form.happenTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -137,6 +138,7 @@
               v-else
               v-model="form.alarmTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -216,7 +218,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

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

@@ -12,7 +12,7 @@
           <el-form-item label="姓名：">
             <p v-if="form.view == '查看'">{{ form.staffName }}</p>
             <el-select
-              v-model="form.staffName"
+              v-model="form.staffId"
               filterable
               @change="staffChange"
               style="width: 100%;"
@@ -115,6 +115,7 @@
               v-else
               v-model="form.goworkTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -194,7 +195,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

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

@@ -12,7 +12,7 @@
           <el-form-item label="姓名：">
             <p v-if="form.view == '查看'">{{ form.staffName }}</p>
             <el-select
-              v-model="form.staffName"
+              v-model="form.staffId"
               filterable
               @change="staffChange"
               style="width: 100%;"
@@ -74,6 +74,7 @@
               v-else
               v-model="form.happenTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -154,7 +155,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

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

@@ -12,7 +12,7 @@
           <el-form-item label="姓名：">
             <p v-if="form.view == '查看'">{{ form.staffName }}</p>
             <el-select
-              v-model="form.staffName"
+              v-model="form.staffId"
               filterable
               @change="staffChange"
               style="width: 100%;"
@@ -127,6 +127,7 @@
               v-else
               v-model="form.reviewTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -207,7 +208,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

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

@@ -188,7 +188,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
                     PerformInfo performInfo = new PerformInfo();
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getRecordId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(item.getPerformType()));
                     updateAppealResult(performInfo, entity);
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -208,7 +208,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
                     //判断是否存在申诉
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
                     updateAppealResult(performInfo, entity);
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -228,7 +228,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.评价差评绩效.getValue());
                     //判断是否存在申诉
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
 
                     updateAppealResult(performInfo, entity);
                     return performInfo;
@@ -249,7 +249,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.评价投诉绩效.getValue());
 
                     //判断是否存在申诉
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
                     updateAppealResult(performInfo, entity);
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -268,7 +268,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.办件绩效.getValue());
                     //判断是否存在申诉
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
 
                     updateAppealResult(performInfo, entity);
                     return performInfo;
@@ -288,7 +288,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
                     //判断是否存在申诉
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
                     updateAppealResult(performInfo, entity);
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -307,7 +307,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     BeanUtils.copyProperties(item, performInfo, BeanUtil.getNullPropertyNames(item));
                     performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
                     //判断是否存在申诉
-                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()).performType(performInfo.getPerformType()));
 
                     updateAppealResult(performInfo, entity);
                     return performInfo;

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

+package com.mortals.xhx.module.attendance.dingmsg;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author ZYW
+ * @date 2023-07-18 15:05
+ */
+
+@NoArgsConstructor
+@Data
+public class EventEntity {
+
+    @JsonProperty("processInstanceId")
+    private String processInstanceId;  //审批实例id。
+    @JsonProperty("finishTime")
+    private Long finishTime;  //结束审批实例时间。时间戳，单位毫秒。
+    @JsonProperty("corpId")
+    private String corpId;  //审批实例对应的企业corpId。
+    @JsonProperty("EventType")
+    private String eventType;   //事件类型。
+    @JsonProperty("businessId")
+    private String businessId;
+    @JsonProperty("title")
+    private String title;   //实例标题。
+    @JsonProperty("type")
+    private String type;  //finish：审批正常结束（同意或拒绝）terminate：审批终止（发起人撤销审批单）
+    @JsonProperty("url")
+    private String url;   //审批实例url，可在钉钉内跳转到审批页面。
+    @JsonProperty("result")
+    private String result;  //正常结束时result为agree，拒绝时result为refuse，审批终止时没这个值。
+    @JsonProperty("createTime")
+    private Long createTime;  //创建审批实例时间。时间戳，单位毫秒。
+    @JsonProperty("processCode")
+    private String processCode;  //审批模板的唯一码。
+    @JsonProperty("bizCategoryId")
+    private String bizCategoryId;
+    @JsonProperty("staffId")
+    private String staffId;   //发起审批实例的员工userId。
+    @JsonProperty("remark")
+    private String remark;   //remark表示操作时写的评论内容。
+}

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

@@ -7,13 +7,16 @@ import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiGettokenRequest;
 import com.dingtalk.api.response.OapiGettokenResponse;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.xhx.common.pdu.ApiRespPdu;
 import com.mortals.xhx.module.attendance.dingmsg.DingCallbackCrypto;
 import com.mortals.xhx.module.attendance.dingmsg.dingmsgreq.DingResponsMeassageReq;
 import com.mortals.xhx.module.attendance.dingmsg.dingmsgreq.EncryptReq;
+import com.mortals.xhx.module.dingding.personal.service.IDingPersonService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.logging.Log;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +36,9 @@ import java.util.Map;
 @Slf4j
 public class DingMessageController {
 
+    @Autowired
+    private IDingPersonService dingPersonService;
+
     /**
      * appKey
      */
@@ -60,31 +66,34 @@ public class DingMessageController {
     public Map<String, String> getOaMessage(@RequestParam(value = "msg_signature", required = false) String msg_signature,
                                             @RequestParam(value = "timestamp", required = false) String timeStamp,
                                             @RequestParam(value = "nonce", required = false) String nonce,
-                                            @RequestBody(required = false) JSONObject json) throws DingCallbackCrypto.DingTalkEncryptException {
+                                            @RequestBody(required = false) JSONObject json)  {
+        log.info("钉钉推送参数" + msg_signature+"---"+timeStamp+"---"+nonce+"---"+json.toJSONString() );
         try {
-            // 1. 从http请求中获取加解密参数
-
-            // 2. 使用加解密类型
-            // Constant.OWNER_KEY 说明：
-            // 1、开发者后台配置的订阅事件为应用级事件推送，此时OWNER_KEY为应用的APP_KEY。
-            // 2、调用订阅事件接口订阅的事件为企业级事件推送，
-            //      此时OWNER_KEY为：企业的appkey（企业内部应用）或SUITE_KEY（三方应用）
+            //  从http请求中获取加解密参数
             DingCallbackCrypto callbackCrypto = new DingCallbackCrypto(token, aesKey, appKey);
             String encryptMsg = json.getString("encrypt");
             String decryptMsg = callbackCrypto.getDecryptMsg(msg_signature, timeStamp, nonce, encryptMsg);
 
-            // 3. 反序列化回调事件json数据
+            // 反序列化回调事件json数据
             JSONObject eventJson = JSON.parseObject(decryptMsg);
             String eventType = eventJson.getString("EventType");
 
-            // 4. 根据EventType分类处理
+            // 根据EventType分类处理
             if ("check_url".equals(eventType)) {
                 // 测试回调url的正确性
                 log.info("测试回调url的正确性");
-            } else if ("user_add_org".equals(eventType)) {
-                // 处理通讯录用户增加事件
-                log.info("发生了：" + eventType + "事件");
-            } else {
+            }
+            else if("bpms_instance_change".equals(eventType)){  //请假等需要审批的消息
+                // 处理审批实例始末（审批任务开始、结束）
+                // 存入数据库
+//                log.info("发生了：" + eventType + "事件" );
+//                log.info("返回处理参数：" + eventJson.toJSONString() );
+                if(eventJson.getString("processInstanceId") != null){
+                    Rest<String> rest = dingPersonService.getOaRecordsById(eventJson.getString("processInstanceId"));
+                    log.info("审批详情：" + rest.getData());
+                }
+            }
+            else {
                 // 添加其他已注册的
                 log.info("发生了：" + eventType + "事件");
             }

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

@@ -41,5 +41,12 @@ public interface IDingPersonService extends IDingTalkService {
      */
     Rest<String>  sendWorkMsg(WorkMsgReq workMsgReq);
 
+    /**
+     * 审批详情
+     * @param processInstanceId 审批实例ID。
+     * @return
+     */
+    Rest<String>  getOaRecordsById(String processInstanceId);
+
 
 }

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

 package com.mortals.xhx.module.dingding.personal.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceResponse;
+import com.aliyun.tea.TeaException;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
 import com.dingtalk.api.request.OapiV2UserGetbymobileRequest;
@@ -14,6 +16,7 @@ import com.mortals.xhx.module.dingding.personal.model.req.workmsg.WorkMsgReq;
 import com.mortals.xhx.module.dingding.personal.service.IDingPersonService;
 import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.logging.Log;
 import org.springframework.stereotype.Service;
 
 
@@ -98,5 +101,34 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
         }
     }
 
+    /**
+     * 使用 Token 初始化账号Client
+     * @return Client
+     * @throws Exception
+     */
+    public static com.aliyun.dingtalkworkflow_1_0.Client createClient() throws Exception {
+        com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
+        config.protocol = "https";
+        config.regionId = "central";
+        return new com.aliyun.dingtalkworkflow_1_0.Client(config);
+    }
+
+    @Override
+    public Rest<String> getOaRecordsById(String processInstanceId) {
+        try {
+            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();
+            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());
+            log.info("根据id查询审批详情:", rsp.getBody().getResult().toString());
+            return Rest.ok("成功", rsp.getBody().getResult().toString());
+        } catch (Exception e) {
+            log.info("根据用户查询审批详情失败", e);
+            return Rest.fail(e.getMessage());
+
+        }
+    }
 }