แก้เครื่องราชย์
This commit is contained in:
parent
9af97134f4
commit
afb7b60a19
7 changed files with 20842 additions and 31 deletions
|
|
@ -306,7 +306,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
});
|
});
|
||||||
|
|
||||||
// check วันที่บรรจะต้องน้อยกว่า 29/5/ปี-8 ขอ บม.
|
// check วันที่บรรจะต้องน้อยกว่า 29/5/ปี-8 ขอ บม.
|
||||||
|
|
@ -371,7 +376,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"อัตราค่าจ้าง {p?.SalaryCondition?.ToString("#,##0")??""}"
|
Result = $"อัตราค่าจ้าง {p?.SalaryCondition?.ToString("#,##0")??""}"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})).ToList();
|
})).ToList();
|
||||||
|
|
||||||
var bcpRoyal = await _dbContext.Set<Insignia>()
|
var bcpRoyal = await _dbContext.Set<Insignia>()
|
||||||
|
|
@ -450,7 +460,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
.FirstOrDefault() == null ? 0 :
|
.FirstOrDefault() == null ? 0 :
|
||||||
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
p.ProfileInsignia.Where(x => x.InsigniaId.Value == bcmRoyal.Id).OrderBy(x => x.Year)
|
||||||
.FirstOrDefault().Year,
|
.FirstOrDefault().Year,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => (x.SalaryCondition >= 8340 && x.SalaryCondition < 10150) && !x.IsHigherLevel)
|
.Where(x => (x.SalaryCondition >= 8340 && x.SalaryCondition < 10150) && !x.IsHigherLevel)
|
||||||
|
|
@ -510,7 +525,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"ได้รับ บ.ม. ในปี {p.FirstRecvInsigniaYear}"
|
Result = $"ได้รับ บ.ม. ในปี {p.FirstRecvInsigniaYear}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -585,7 +605,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => (x.SalaryCondition >= 8340 && x.SalaryCondition < 10150) && !x.IsHigherLevel)
|
.Where(x => (x.SalaryCondition >= 8340 && x.SalaryCondition < 10150) && !x.IsHigherLevel)
|
||||||
|
|
@ -645,7 +670,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -787,7 +817,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
});
|
});
|
||||||
|
|
||||||
var s1 = ((from p in inst_profile
|
var s1 = ((from p in inst_profile
|
||||||
|
|
@ -850,7 +885,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"อัตราค่าจ้าง {p?.SalaryCondition?.ToString("#,##0")??""}"
|
Result = $"อัตราค่าจ้าง {p?.SalaryCondition?.ToString("#,##0")??""}"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})).ToList();
|
})).ToList();
|
||||||
|
|
||||||
var bcpRoyal = await _dbContext.Set<Insignia>()
|
var bcpRoyal = await _dbContext.Set<Insignia>()
|
||||||
|
|
@ -931,7 +971,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => (x.SalaryCondition >= 10150) && !x.IsHigherLevel)
|
.Where(x => (x.SalaryCondition >= 10150) && !x.IsHigherLevel)
|
||||||
|
|
@ -991,7 +1036,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"ได้รับ บ.ช. ในปี {p.FirstRecvInsigniaYear}"
|
Result = $"ได้รับ บ.ช. ในปี {p.FirstRecvInsigniaYear}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -1063,7 +1113,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => (x.SalaryCondition >= 10150) && !x.IsHigherLevel)
|
.Where(x => (x.SalaryCondition >= 10150) && !x.IsHigherLevel)
|
||||||
|
|
@ -1123,7 +1178,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"ได้รับ จ.ม. ในปี {p.FirstRecvInsigniaYear}"
|
Result = $"ได้รับ จ.ม. ในปี {p.FirstRecvInsigniaYear}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -1271,7 +1331,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
});
|
});
|
||||||
|
|
||||||
// check วันที่บรรจะต้องน้อยกว่า 29/5/ปี-5
|
// check วันที่บรรจะต้องน้อยกว่า 29/5/ปี-5
|
||||||
|
|
@ -1330,7 +1395,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})).ToList();
|
})).ToList();
|
||||||
|
|
||||||
var s2 = (from p in allProfilesByRoot
|
var s2 = (from p in allProfilesByRoot
|
||||||
|
|
@ -1406,7 +1476,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => x.SalaryCondition < 10190 && !x.IsHigherLevel)
|
.Where(x => x.SalaryCondition < 10190 && !x.IsHigherLevel)
|
||||||
|
|
@ -1466,7 +1541,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -1549,7 +1629,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => x.SalaryCondition >= 10190 && !x.IsHigherLevel)
|
.Where(x => x.SalaryCondition >= 10190 && !x.IsHigherLevel)
|
||||||
|
|
@ -1602,7 +1687,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"ได้รับเงินเดือน {p.SalaryCondition} บาท"
|
Result = $"ได้รับเงินเดือน {p.SalaryCondition} บาท"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -1685,7 +1775,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => x.SalaryCondition >= 10190 && !x.IsHigherLevel)
|
.Where(x => x.SalaryCondition >= 10190 && !x.IsHigherLevel)
|
||||||
|
|
@ -1745,7 +1840,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
Result = $"วันที่บรรจุเข้ารับราชการ {p.ProfileDateAppoint.ToThaiFullDate3()}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -1930,7 +2030,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Select(p => new InsigniaResultSet
|
.Select(p => new InsigniaResultSet
|
||||||
|
|
@ -1981,7 +2086,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -2071,7 +2181,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => x.FirstPositonLevelDate < new DateTime(period.Year - 5, 5, 29))
|
.Where(x => x.FirstPositonLevelDate < new DateTime(period.Year - 5, 5, 29))
|
||||||
|
|
@ -2125,7 +2240,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
$"ดำรงตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel} ตั้งแต่วันที่ {(p.FirstPositonLevelDate == null ? "-" : p.FirstPositonLevelDate.Value.ToThaiFullDate3())}"
|
$"ดำรงตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel} ตั้งแต่วันที่ {(p.FirstPositonLevelDate == null ? "-" : p.FirstPositonLevelDate.Value.ToThaiFullDate3())}"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -2279,7 +2399,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Select(p => new InsigniaResultSet
|
.Select(p => new InsigniaResultSet
|
||||||
|
|
@ -2330,7 +2455,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
Result = $"ตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel}"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -2420,7 +2550,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList()
|
.ToList()
|
||||||
.Where(x => x.FirstPositonLevelDate < new DateTime(period.Year - 5, 5, 29))
|
.Where(x => x.FirstPositonLevelDate < new DateTime(period.Year - 5, 5, 29))
|
||||||
|
|
@ -2474,7 +2609,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
$"ดำรงตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel} ตั้งแต่วันที่ {(p.FirstPositonLevelDate == null ? "-" : p.FirstPositonLevelDate.Value.ToThaiFullDate3())}"
|
$"ดำรงตำแหน่ง {p.Position} ประเภท {p.PositionType} ระดับ {p.PositionLevel} ตั้งแต่วันที่ {(p.FirstPositonLevelDate == null ? "-" : p.FirstPositonLevelDate.Value.ToThaiFullDate3())}"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -7975,7 +8115,12 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
});
|
});
|
||||||
|
|
||||||
// check วันที่บรรจะต้องมากกว่า 25 ปี
|
// check วันที่บรรจะต้องมากกว่า 25 ปี
|
||||||
|
|
@ -8025,8 +8170,13 @@ namespace BMA.EHR.Application.Repositories
|
||||||
Child4Id = p.Child4Id,
|
Child4Id = p.Child4Id,
|
||||||
Child4DnaId = p.Child4DnaId,
|
Child4DnaId = p.Child4DnaId,
|
||||||
Child4 = p.Child4,
|
Child4 = p.Child4,
|
||||||
ProfileType = p.ProfileType
|
ProfileType = p.ProfileType,
|
||||||
|
|
||||||
|
MarkDiscipline = p.MarkDiscipline,
|
||||||
|
MarkInsignia = p.MarkInsignia,
|
||||||
|
MarkLeave = p.MarkLeave,
|
||||||
|
MarkRate = p.MarkRate
|
||||||
|
|
||||||
})).ToList();
|
})).ToList();
|
||||||
|
|
||||||
var result_candidate = new List<InsigniaResultSet>();
|
var result_candidate = new List<InsigniaResultSet>();
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,14 @@ namespace BMA.EHR.Application.Requests
|
||||||
public string? Child4 { get; set; }
|
public string? Child4 { get; set; }
|
||||||
|
|
||||||
public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
|
public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
|
||||||
|
|
||||||
|
public bool? MarkDiscipline { get; set; } = false;
|
||||||
|
|
||||||
|
public bool? MarkLeave { get; set; } = false;
|
||||||
|
|
||||||
|
public bool? MarkRate { get; set; } = false;
|
||||||
|
|
||||||
|
public bool? MarkInsignia { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MatchingCondition
|
public class MatchingCondition
|
||||||
|
|
|
||||||
|
|
@ -65,5 +65,13 @@ namespace BMA.EHR.Application.Responses.Profiles
|
||||||
public string? Child4 { get; set; }
|
public string? Child4 { get; set; }
|
||||||
|
|
||||||
public string? ProfileType { get; set; }
|
public string? ProfileType { get; set; }
|
||||||
|
|
||||||
|
public bool? MarkDiscipline { get; set; } = false;
|
||||||
|
|
||||||
|
public bool? MarkLeave { get; set; } = false;
|
||||||
|
|
||||||
|
public bool? MarkRate { get; set; } = false;
|
||||||
|
|
||||||
|
public bool? MarkInsignia { get; set; } = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -87,5 +87,7 @@ namespace BMA.EHR.Domain.Models.Insignias
|
||||||
public Guid? Child4Id { get; set; }
|
public Guid? Child4Id { get; set; }
|
||||||
public Guid? Child4DnaId { get; set; }
|
public Guid? Child4DnaId { get; set; }
|
||||||
public string? Child4 { get; set; }
|
public string? Child4 { get; set; }
|
||||||
|
|
||||||
|
public bool? MarkInsignia { get; set; } = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
20612
BMA.EHR.Infrastructure/Migrations/20250515023219_Add MarkInsignia Field.Designer.cs
generated
Normal file
20612
BMA.EHR.Infrastructure/Migrations/20250515023219_Add MarkInsignia Field.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,28 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace BMA.EHR.Infrastructure.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class AddMarkInsigniaField : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "MarkInsignia",
|
||||||
|
table: "InsigniaRequestProfiles",
|
||||||
|
type: "tinyint(1)",
|
||||||
|
nullable: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "MarkInsignia",
|
||||||
|
table: "InsigniaRequestProfiles");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -6674,6 +6674,9 @@ namespace BMA.EHR.Infrastructure.Migrations
|
||||||
.HasColumnType("tinyint(1)")
|
.HasColumnType("tinyint(1)")
|
||||||
.HasComment("แจ้งเตือน มีโทษทางวินัย");
|
.HasComment("แจ้งเตือน มีโทษทางวินัย");
|
||||||
|
|
||||||
|
b.Property<bool?>("MarkInsignia")
|
||||||
|
.HasColumnType("tinyint(1)");
|
||||||
|
|
||||||
b.Property<bool?>("MarkLeave")
|
b.Property<bool?>("MarkLeave")
|
||||||
.HasColumnType("tinyint(1)")
|
.HasColumnType("tinyint(1)")
|
||||||
.HasComment("แจ้งเตือน ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน");
|
.HasComment("แจ้งเตือน ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue