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

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

@@ -131,9 +131,10 @@
                 >
                   <el-image
                     v-if="
-                      val.filePath.includes(
-                        '.png' || '.jpg' || '.jpeg' || 'bmp'
-                      )
+                      val.filePath.includes('.png') ||
+                        val.filePath.includes('.jpg') ||
+                        val.filePath.includes('.jpeg') ||
+                        val.filePath.includes('.bmp')
                     "
                     style="width: 100px; height: 100px"
                     :src="
@@ -156,7 +157,7 @@
                     alt=""
                     @click="hanldeDownloadFile(val)"
                   />
-                  {{ val.fileName }}
+                  <p>{{ val.fileName }}</p>
                 </div>
               </div>
             </el-col>
@@ -780,14 +781,22 @@ export default {
         flex-direction: column;
         justify-content: center;
         align-items: center;
-        width: 60px;
-        height: 80px;
+        width: 100px;
+        height: 100px;
         cursor: pointer;
+        margin-right: 10px;
         img {
-          width: 50px;
-          height: 50px;
+          width: 100%;
+          height: 80px;
           margin-top: 10px;
         }
+        p {
+          width: 100%;
+          text-align: center;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
       }
     }
   }

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/message/impl/MessageServiceImpl.java

@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MessageServiceImpl implements MessageService {
 
-    @Value("${webUrl:''}")
+    @Value("${webUrl:}")
     private String webUrl;
     @Autowired
     private IDingPersonService dingPersonService;
@@ -34,6 +34,7 @@ public class MessageServiceImpl implements MessageService {
         Link link = new Link();
         //link.setMessageUrl(webUrl + dingMsg.getPath());
         link.setMessageUrl(webUrl + dingMsg.getPath());
+        log.info("linkUrl:"+link.getMessageUrl());
 
         if (SubAddTypeEnum.增加.getValue() == dingMsg.getSubAddType()) {
             link.setText(String.format("你好，经人工核实后你在%%-%s" +

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

 package com.mortals.xhx.module.dingding.personal.service;
 
 
+import com.aliyun.dingtalkworkflow_1_0.models.GetProcessInstanceResponseBody;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.dingding.IDingTalkService;
 import com.mortals.xhx.module.dingding.personal.model.req.workmsg.WorkMsgReq;
@@ -8,6 +9,7 @@ import com.mortals.xhx.module.hik.person.model.req.org.OrgListReq;
 import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
 import com.mortals.xhx.module.hik.person.model.rsp.org.OrgDataInfo;
 import com.mortals.xhx.module.hik.person.model.rsp.person.PersonDataInfo;
+import org.apache.poi.ss.formula.functions.T;
 
 /**
  * 钉钉人事相关服务类
@@ -46,7 +48,7 @@ public interface IDingPersonService extends IDingTalkService {
      * @param processInstanceId 审批实例ID。
      * @return
      */
-    Rest<String>  getOaRecordsById(String processInstanceId);
+    Rest<GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResult>  getOaRecordsById(String processInstanceId);
 
 
 }

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

@@ -2,6 +2,7 @@ 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.dingtalkworkflow_1_0.models.GetProcessInstanceResponseBody;
 import com.aliyun.tea.TeaException;
 import com.dingtalk.api.DingTalkClient;
 import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request;
@@ -17,6 +18,7 @@ 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.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -70,7 +72,6 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
     public Rest<String> sendWorkMsg(WorkMsgReq workMsgReq) {
         try {
             DingTalkClient client = getDingTalkClient("/topapi/message/corpconversation/asyncsend_v2");
-
             OapiMessageCorpconversationAsyncsendV2Request req = new OapiMessageCorpconversationAsyncsendV2Request();
             req.setAgentId(agentId);
             req.setUseridList(workMsgReq.getUseridList());
@@ -123,7 +124,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
     }
 
     @Override
-    public Rest<String> getOaRecordsById(String processInstanceId) {
+    public Rest<GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResult> 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();
@@ -132,8 +133,7 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
                     .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());
+            return Rest.ok("成功", rsp.getBody().getResult());
         } catch (Exception e) {
             log.info("根据用户查询审批详情失败", e);
             return Rest.fail(e.getMessage());

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java

@@ -128,7 +128,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
             if (appeal.getSubAddType() == SubAddTypeEnum.扣除.getValue()) {
                 //需增一条记录后 冲销相关核查的记录
                 if (PerformTypeEnum.考勤绩效.getValue().equals(appeal.getPerformType())) {
-                    CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(appeal.getId(), context);
+                    CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(appeal.getCheckRecordId(), context);
 
                     CheckAttendRecordEntity checkAttendRecordEntity = new CheckAttendRecordEntity();
                     checkAttendRecordEntity.initAttrValue();
@@ -138,7 +138,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
                     checkAttendRecordEntity.setRemark(appealMsg);
                     checkAttendRecordService.save(checkAttendRecordEntity, context);
                 } else if (PerformTypeEnum.评价差评绩效.getValue().equals(appeal.getPerformType())) {
-                    CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(appeal.getId(), context);
+                    CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(appeal.getCheckRecordId(), context);
                     CheckReviewRecordEntity checkRecordEntity = new CheckReviewRecordEntity();
                     checkRecordEntity.initAttrValue();
                     BeanUtils.copyProperties(checkEntity, checkRecordEntity, new String[]{"id", "recordId"});
@@ -149,7 +149,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
                     checkRecordEntity.setCreateUserId(this.getContextUserId(context));
                     checkReviewRecordService.save(checkRecordEntity, context);
                 } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(appeal.getPerformType())) {
-                    CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(appeal.getId(), context);
+                    CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(appeal.getCheckRecordId(), context);
 
                     CheckComplainRecordEntity checkRecordEntity = new CheckComplainRecordEntity();
                     checkRecordEntity.initAttrValue();
@@ -162,7 +162,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
                     checkComplainRecordService.save(checkRecordEntity, context);
 
                 } else if (PerformTypeEnum.办件绩效.getValue().equals(appeal.getPerformType())) {
-                    CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(appeal.getId(), context);
+                    CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(appeal.getCheckRecordId(), context);
                     CheckGoworkRecordEntity checkRecordEntity = new CheckGoworkRecordEntity();
                     checkRecordEntity.initAttrValue();
                     BeanUtils.copyProperties(checkEntity, checkRecordEntity, new String[]{"id", "recordId"});
@@ -174,7 +174,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
                     checkGoworkRecordService.save(checkRecordEntity, context);
 
                 } else if (PerformTypeEnum.效能绩效.getValue().equals(appeal.getPerformType())) {
-                    CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(appeal.getId(), context);
+                    CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(appeal.getCheckRecordId(), context);
                     CheckEffectRecordEntity checkRecordEntity = new CheckEffectRecordEntity();
                     checkRecordEntity.initAttrValue();
                     BeanUtils.copyProperties(checkEntity, checkRecordEntity, new String[]{"id", "recordId"});
@@ -186,7 +186,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
                     checkEffectRecordService.save(checkRecordEntity, context);
 
                 } else if (PerformTypeEnum.其它绩效.getValue().equals(appeal.getPerformType())) {
-                    CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(appeal.getId(), context);
+                    CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(appeal.getCheckRecordId(), context);
                     CheckOtherRecordEntity checkRecordEntity = new CheckOtherRecordEntity();
                     checkRecordEntity.initAttrValue();
                     BeanUtils.copyProperties(checkEntity, checkRecordEntity, new String[]{"id", "recordId"});

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java

@@ -15,6 +15,7 @@ import com.mortals.xhx.module.perform.model.PerformRulesQuery;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -54,6 +55,7 @@ import static java.util.stream.Collectors.toMap;
  */
 @RestController
 @RequestMapping("perform/attend/appeal")
+@Slf4j
 public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingController<PerformAttendAppealService, PerformAttendAppealEntity, Long> {
 
     @Autowired
@@ -125,6 +127,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
      */
     @PostMapping(value = "audit")
     public String appealAudit(@RequestBody PerformAttendAppealEntity appeal) {
+        log.info("appeal audit ==>{}",JSONObject.toJSONString(appeal));
         JSONObject jsonObject = new JSONObject();
         String busiDesc = this.getModuleDesc() + "审核";
         try {

attendance-performance-manager/src/main/resources/bootstrap.yml

@@ -66,13 +66,12 @@ hik:
 #  AppKey: dingpqzradgfr4efdi2j
 #  AppSecret: bF2WALmo5_Wuj3hg5gXeWqezrYnZChUJ88HjzNWpkA9ivdOxfBDGOGYcfVRfB3vd
 #  domain: https://oapi.dingtalk.com
-
+webUrl: @profiles.webUrl@
 dingtalk:
   domain: @profiles.dingtalk.domain@
   agentId: @profiles.dingtalk.agentId@
   AppKey: @profiles.dingtalk.appKey@
   AppSecret: @profiles.dingtalk.appSecret@
-  webUrl: @profiles.webUrl@
   AesKey: @profiles.dingtalk.aesKey@
   token: @profiles.dingtalk.token@