1

Edu.Common/Enum/User/WFTTemplateTypeEnum.cs

@@ -11,22 +11,22 @@ namespace Edu.Common.Enum.User
         /// <summary>
         /// 请假
         /// </summary>
-        [EnumField("请假|/Upload/Icon/Audit/qingjia.png|1|app_user_workflow_askforleave_template|app_user_workflow_askforleave_submit")]
+        [EnumField("请假|/Upload/Icon/Audit/qingjia.png|1|/workflow/AskForLeaveTemplate|/workflow/AskForLeaveSubmit")]
         AskForLeave = 1,
         /// <summary>
         /// 出差
         /// </summary>
-        [EnumField("出差|/Upload/Icon/Audit/chucai.png|1|app_user_workflow_evection_template|app_user_workflow_evection_submit")]
+        [EnumField("出差|/Upload/Icon/Audit/chucai.png|1|/workflow/EvectionTemplate|/workflow/EvectionSubmit")]
         Evection = 2,
         /// <summary>
         /// 外出
         /// </summary>
-        [EnumField("外出|/Upload/Icon/Audit/waichu.png|1|app_user_workflow_goout_template|app_user_workflow_goout_submit")]
+        [EnumField("外出|/Upload/Icon/Audit/waichu.png|1|/workflow/GooutTemplate|/workflow/GooutSubmit")]
         Goout = 3,
         /// <summary>
         /// 补卡
         /// </summary>
-        [EnumField("补卡|/Upload/Icon/Audit/buka.png|1|app_user_workflow_reissueCard_template|app_user_workflow_reissueCard_submit")]
+        [EnumField("补卡|/Upload/Icon/Audit/buka.png|1|/workflow/ReissueCardTemplate|/workflow/ReissueCardSubmit")]
         ReissueCard = 4,
     }
 }

Edu.Module.Course/StudentBillModule.cs

@@ -739,6 +739,7 @@ namespace Edu.Module.Course
         {
             var backModel = student_BackClassRepository.GetEntity(backClassId);
             if (backModel == null || backModel.AuditStatus != BackClassAuditStatusEnum.Pass) { return "退课流程未审核通过"; }
+            if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
             var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
             if (guestModel == null || guestModel.GuestState != 2) { return "客人名单状态不正确"; }
 

Edu.Module.Course/TeachingRewardsModule.cs

@@ -600,6 +600,8 @@ namespace Edu.Module.Course
         {
             var tmodel = teaching_BonusRepository.GetEntity(bonusId);
             if (tmodel == null) { return "教师奖励不存在"; }
+            if (tmodel.State != BonusStateEnum.Confirmed) { return "奖金状态不正确"; }
+            if (!string.IsNullOrEmpty(tmodel.FinanceId)) { return "已制单，无法再次生成单据"; }
             var list = teaching_BonusDetailRepository.GetTeachingBonusStatistics(new RB_Teaching_BonusDetail_ViewModel() { Group_Id = userInfo.Group_Id, BonusId = bonusId });
 
             string msg = "";
@@ -1209,6 +1211,7 @@ namespace Edu.Module.Course
             var tmodel = teaching_PerfRepository.GetEntity(perfId);
             if (tmodel == null) { return "教师绩效不存在"; }
             if (tmodel.PerfState != PerfStateEnum.Confirmed) { return "未确认无法制单"; }
+            if (tmodel.FinanceId > 0) { return "财务单据已存在，无法再次制单"; }
 
             string msg = "";
             var teacherModel = teacherRepository.GetTeacherList(tmodel.TeacherId.ToString()).FirstOrDefault();

Edu.Repository/User/Rb_attendanceRepository.cs

@@ -60,8 +60,8 @@ case when a.Id is NULL then 2 else 1 end AS IsBind ,e.EmName as UpdateName,b.SNa
 (select count(*) from rb_employee em where em.IsLeave=0 and em.RB_Branch_id=b.SId) as PeopleNum,
 case when a.Id IS NOT NULL THEN (select GROUP_CONCAT(ws.Workday SEPARATOR '、') 
 from rb_workdayseting ws where ws.AttendanceId=a.Id) ELSE '' END as AttendanceDate 
-from  Rb_attendance a 
-left join rb_school b on a.RB_BranchId = b.SId
+from rb_school b  
+left join Rb_attendance a on a.RB_BranchId = b.SId
 left join rb_employee e on a.UpdateBy=e.EmployeeId )t  " + where + " order by t.IsBind,t.RB_BranchId asc").ToList();
             return pageList;
         }

Edu.WebApi/Controllers/User/WorkFlowController.cs

@@ -56,7 +56,7 @@ namespace Edu.WebApi.Controllers.User
                         string[] tempTypeStr = template.TemplateType.ToName().Split('|');
                         if (tempTypeStr.Length > 1)
                         {
-                            var tmp = new { id = template.Id, name = template.Name, icon = Config.GetOssFileUrl + tempTypeStr[1], cmd = tempTypeStr[3], submitCmd = tempTypeStr[4], jumpUrl = $"vt://applySubmit/view?type={template.Name}" };
+                            var tmp = new { id = template.Id, name = template.Name, icon = Config.GetErpFileUrl(tempTypeStr[1]), cmd = tempTypeStr[3], submitCmd = tempTypeStr[4], jumpUrl = $"vt://applySubmit/view?type={template.Name}" };
                             templateList.Add(tmp);
                         }
                     }