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

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultAddEnum.java

@@ -9,8 +9,8 @@ import java.util.Map;
 * @author zxfei
 */
 public enum CheckResultAddEnum {
-    核查加分("1", "核查加分"),
-    核查不加分("2", "核查不加分");
+    核查加分("核查加分", "核查加分"),
+    核查不加分("核查不加分", "核查不加分");
     private String value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultEnum.java

@@ -9,8 +9,8 @@ import java.util.Map;
 * @author zxfei
 */
 public enum CheckResultEnum {
-    加分或扣分("1", "加分或扣分"),
-    不扣分("2", "不加分或不扣分");
+    加分或扣分("加分或扣分", "加分或扣分"),
+    不扣分("不扣分", "不扣分");
     private String value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/CheckResultSubEnum.java

@@ -9,8 +9,8 @@ import java.util.Map;
 * @author zxfei
 */
 public enum CheckResultSubEnum {
-    核查扣分("1", "核查扣分"),
-    核查不扣分("2", "核查不扣分");
+    核查扣分("核查扣分", "核查扣分"),
+    核查不扣分("核查不扣分", "核查不扣分");
     private String value;
     private String desc;
 

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

@@ -123,6 +123,7 @@ public class DingMessageController {
                         log.info("审批详情："+JSONObject.toJSONString(result) );
                         AttendanceLeaveRecordEntity leaveRecordEntity = new AttendanceLeaveRecordEntity();
                         AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = new AttendanceVacationBalanceEntity();
+                        attendanceVacationBalanceEntity.initAttrValue();
                         leaveRecordEntity.initAttrValue();
                         leaveRecordEntity.setRemark(processInstanceId);   //将钉钉的事物id作为备注填入数据库
 
@@ -260,7 +261,7 @@ public class DingMessageController {
                                 }else if (result.getFormComponentValues().size() > 2) {  //上传的附件
                                     GetProcessInstanceResponseBody.GetProcessInstanceResponseBodyResultFormComponentValues picEntity = result.getFormComponentValues().get(2);
                                     if(picEntity.getName().equals("图片") && picEntity.getValue() != null){
-                                        leaveRecordEntity.setReason(picEntity.getValue());
+                                        leaveRecordEntity.setAttachmentPath(picEntity.getValue());
                                     }
                                 }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java

@@ -27,6 +27,11 @@ public class FeedbackVo extends BaseEntityLong {
     /** 反馈状态 */
     private Integer backStatus;
 
+    /** 开始 反馈开始时间 */
+    private String feedbackTimeStartStart;
+
+    /** 结束 反馈开始时间 */
+    private String feedbackTimeStartEnd;
 
     private List<FeedbackAnswerEntity> feedbackAnswerList=new ArrayList<>();;
 }
\ No newline at end of file