添加照片海康下载

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

@@ -51,9 +51,8 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
             log.info("getPersonByCode:{}", code);
             OapiV2UserGetuserinfoResponse rsp = client.execute(req, getToken());
             log.info("OapiV2UserGetuserinfoResponse:{}", rsp.getBody());
-            log.info("userid:{}", rsp.getResult().getUserid());
             if (rsp.getErrcode() == 0) {
-                return Rest.ok(rsp.getResult().getUserid());
+                return Rest.ok("成功",rsp.getResult().getUserid());
             } else {
                 return Rest.fail(String.format("code:%s,msg:%s", rsp.getErrcode(), rsp.getErrmsg()));
             }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/service/impl/FeedbackServiceImpl.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.feedback.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
+import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.module.feedback.model.*;
 import com.mortals.xhx.module.feedback.model.vo.FeedbackStaffInfoVo;
 import com.mortals.xhx.module.feedback.model.vo.OptionSummaryVo;
@@ -45,7 +46,14 @@ public class FeedbackServiceImpl extends AbstractCRUDServiceImpl<FeedbackDao, Fe
           Date feedbackTimeStart = item.getFeedbackTimeStart();
           Date feedbackTimeEnd = item.getFeedbackTimeEnd();
 
-         // if(DateUtil.compare())
+          if(DateUtil.compare(new Date(),feedbackTimeStart)<0){
+              item.setProcessStatus(0);
+          }
+
+
+          if(DateUtil.compare(new Date(),feedbackTimeEnd)>0){
+              item.setProcessStatus(2);
+          }
 
       });
     }