From d2670e3774511a93ca82bf1779da385f001c0411 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 3 Jun 2024 14:24:39 +0800
Subject: [PATCH] 2

---
 .vs/SGGL_CD/v17/.wsuo                       | Bin 120832 -> 120832 bytes
 SGGL/BLL/API/HSSE/APITrainingTaskService.cs |   1 +
 SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs |   8 ++++++++
 3 files changed, 9 insertions(+)

diff --git a/.vs/SGGL_CD/v17/.wsuo b/.vs/SGGL_CD/v17/.wsuo
index 6f9702ec437166dfdb35dfd590af9fce026dd1e6..c059299be0700ab5697a59365d6d509028807b35 100644
GIT binary patch
delta 1990
zcmcgtT})eL7(VZz2TE!AYY&vsmbM_2g-S~clt1mpbdy1UfZ&|Fp+AfT$u?LOH)HFJ
zN}?B|Z{mrGMpw)(beL&Xt~535V)4Rhg2SlsFWwllJDRL<i0{|*n8phu#`rbw`M&RY
z-}8RY_x_wFu9YROm0b!z!@I%X090t<n<}f<#$S2*gRjBB(J<n9{yZ#VmXE^;jFrSS
zBZST|6^(KPMWg-q-QC?P+9^qDNoboNWwch2RFY^&T1l!`g7rz20(LN}XcKD)k*(Wk
zZ6o<5eOd7~<MIV>);#}rRECPF$ZpEX#SU#4DK;1(w${?j2r`TjD<vYLjuvW?3KGVS
z8Sbo1Yw?W2Ac_PqYc`6=DKCJUIbya<(5CY0S*&D$%}s?pCR9)9ynj(1rhQVS*Bve3
zV?}x#6wFDL4$o8sgtLS%;71h$NtNM$KeBQ|!&MUjJqcZC7i(%-z=+w(IHe|5<<Ao`
z6)6Q4c{S$hM{rmi!i0VpH+UyHctvvwY1o+J7P(38H2ogqLiAkXCb%fKz&*~L!q;^c
zW?OCLco4|8lteyPc!V|z47!iv^@ao<s=E&_?mMVv>gFOd@MCtLU(FK95-YzAK8!W`
zG{8!bVQjG52%`i{VXn=uWCUdx+A(JHX}CJVSY7;yKZ;qKU#%dBFNTj}tew2yLzrAK
z%)9y+0rJI@|1z5CTsyVp5zK1iZ~$YvIG8c3`%D8Z1qL!Xfn{PcovZn0=3v6C=%YN1
z;iWnkZj^N69Ya9LdPMdJ!x*cN!$Hg%Z>k$eVJTALwkePgzquGp98lm=(=uirvZB>&
zQUV90<~Zr<EojC$vna6Oarm5h002KR@3MsBb?5sqicfZoXn^%)J&DW#w>v&p8w-F8
z3amPGm=jr@74fh8Z}@lanZIR7N^OEkdS(kcr0;LRfRx#U4z%%=X|L4_>WhU7JWF$0
z-SR3x-AeFb>GCEt?cp6gy_57D%BMmO39B<aR~t~9$#rAl7zVCx?+4)s0V>QHKh5{y
zw#lEL^GWJley=|R>CBH_KAjoL(BrOGSj{}3U@#KA*Bn{~F=J8TYd$?%M@^Jn3$HDm
znCy4DT==4|6}_W#V!xyRf^#O^<>-pI?Gd-bX?HtZm>HeIDgS=-jyVQTopg8KyR;aw
znythACjtwd)M%`eTb%BhZjZy|viCY?rtR)XPt+dj3PtQQ5l45Vr#D1E`s!E-U%Pnj
z^!!A4Hab6D@B<k9>V9dw3JmzhhxAz;uP!@wll>`i_`-M}dIL7<(M~)&D+;Wu%cZxr
zpjE2+5@vBZFrONKDfJV-ni=9#-|^D%H{nM5#?KyY>TW3oi%;Dl)nWb$5B$p_d@P+=
z2h;kuO1NFx5_a~v!_z%sd(`6y+1-7;PP@nLaoD5NVOOuGJK~&iht_Xb!8g3Lwgt`d
ufooTEkij4PW)y?J;=EZaX*XeE{RyH2%<w^0Uni-|-r1thl+h}(z2OgOLc<aO

delta 1971
zcmc&!T}+#06#mXfyMC0m6e$1yP!N@33kBK&qXis;X<G(iIEkiwP{bvQ(<XC+P=97j
z^kVc}^g?gMxC?*LCX#ruv22M!5{JnqiQX*4Ez{`55}ME~is$sl6fP!Sd6M(J@B5td
zp7XrtJ?|G>Rt1+;7rc=3<<NZqBUX!*x?7fy!*@RY3CaXP2$tbl@hrTAQE>rIVjyEd
zJ3#O$QkFafMX5cXW?7^v(p{3jNVPQ2B$Y_(NE!Q+jU*ac^Qc=KD#cl;EI&I5)YJG7
z>93>@M?O$|lA^Sseh{UubV?kUC68ioLQc%WBonj5H<#9IQ!fq`Rv)4Tv*J?}kQzvt
zHM_={<BXy<zc7jHqbZ#O)T<?hn#|asb{6rDlvWVP^C~t5)pPokfyZ6~L+T>KVAAP{
z<j6L(DXaEGV(@8l7$?QqEUz*iY0=jaQkVU|`E^&dz;|CvN+fsjwH#xpLxDTGImpC7
zwg<0?W({`&*O(=Ape@SymPo9WTC*Rc#S7rXK*<7BVzlIYyee9t9HW(P?9J`Q*Q;DK
zTHq)~8-^uj!NN?S2Lsg$N*AS-FqS>21-@mz;gkoyqWAD-G>Zzzz#p29;kBGjyw%i4
zV^G7LQ@+PN*Q?>nu1y2MjnQ0>hPy7FIhFiL4CJ}Bf|77Wn!EBCEk-d`Ik=yF)i55-
zZA_2`7e=eEYq*E1(>CLFjaS3XSd|X0x)gY(_H7jiK(K%+qdkLCVz03aSB*{(@QQIa
z<W}Q%ruJ}T6D-&u>LRO6PN0(pHE$$iG5d(d{62twap*)yr$>Fs<o?1dxgH}J%kxP5
zba+p^)D0LgxV6Afh<^b8;7?)H;L&6dB&Ne-7|5sM@JrLD;mQ-V$cV%W?}M_RrfQ7U
zEr0@Ftsm41MM=k0Y}~Hji1!u)EKEen^)_Ivdi}o?@6m%4ukP~)F~PoEvnHOL2(W~|
z+JxqRsq~_EEY#K)ztO#YR^*MJtd!!UPWIt;QL-qJnEhLT$MH%>cf{ElRN%AS#p3)t
zzUQ3cM#g(x`B?0l##NUAgRVxxq=?kBqr$lX2_<6*ZVgl%pjqnL@J)vS4emw^x=-c%
zWUFkGW$S#8X?Vn8ahM(F{LLZHD2@(2f<ceDQ?|7yY%K}fV|3&E*o<<sx!LERu$ipp
z_DPe~-ZE*j`C3~|X1~A1EH_X3eJzpSJsG0GKQnD@Z94PvWKC5~uVdVMn)*4sd;_{v
zW7qlF33zYBj;qHT%4dWZ=yy0GoECfn&yNdJf-JlkZ?ep=HxHJ>&Kt14H1aOaju^tu
zXFwgP_+<;098hYdK=Fq{BRA$p{TrSwN6y;%nln<`aa&xvV+fm{hk}&?5q^WE!_vh=
zATAwId@aG6%4m^g%Ve9}ZnDdAi^<yDVl(+HR-4J(KILzpu(eLKwzjSOkqtkK;o&^^
zjA^`c(EzLAtebE?e0UQ&@U5oC@Xn7=i<gIWXdgbga^WUC2W*>8I8-Jaj%XYE9OHMt
N_~!QI^LH;@`WrbL*OmYP

diff --git a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
index fd88f7cb..a49605c9 100644
--- a/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+++ b/SGGL/BLL/API/HSSE/APITrainingTaskService.cs
@@ -37,6 +37,7 @@ namespace BLL
                                         TrainTypeName = db.Base_TrainType.FirstOrDefault(b => b.TrainTypeId == y.TrainTypeId).TrainTypeName,
                                         TrainLevelName = db.Base_TrainLevel.FirstOrDefault(b => b.TrainLevelId == y.TrainLevelId).TrainLevelName,
                                         PlanStatesName = y.States == "3" ? "已完成" : "培训中",
+                                        TaskStatesName = x.States == "2" ? "已完成" : "培训中",
                                         TrainingItemCode = getTrainingItemCode(y.PlanId)
                                     }).ToList();
 
diff --git a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
index 92a77ae9..6c3b7eb0 100644
--- a/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
+++ b/SGGL/Model/APIItem/HSSE/TrainingTaskItem.cs
@@ -48,6 +48,14 @@ namespace Model
             set;
         }
         /// <summary>
+        /// 培训任务状态
+        /// </summary>
+        public string TaskStatesName
+        {
+            get;
+            set;
+        }
+        /// <summary>
         /// 培训计划时间
         /// </summary>
         public string TrainStartDate