From e7d56433e5cc7d93ac0070e69e3f0dcf89bdf579 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 6 Dec 2021 09:42:14 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=B7=A1=E6=9F=A5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/StatsStaffPatrolRecordDailyDao.java | 3 ++- .../com/epmet/entity/StaffPatrolRecordEntity.java | 5 +++++ .../service/impl/StaffPatrolRecordServiceImpl.java | 11 +++++++---- .../mapper/StatsStaffPatrolRecordDailyDao.xml | 1 + 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java index b937e41f31..5c6d71c590 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java @@ -62,7 +62,8 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao Date: Mon, 6 Dec 2021 10:00:00 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java | 5 +++++ .../com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java | 5 +++++ .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java | 1 + 3 files changed, 11 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java index d0d3445589..f35134647c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java @@ -123,4 +123,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity { */ private String latestPatrolStatus; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java index 93edb74930..8eb89400a2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java @@ -123,4 +123,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity { */ private String latestPatrolStatus; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index 2078d250b7..988ef9a5cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -222,6 +222,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl Date: Mon, 6 Dec 2021 10:02:59 +0800 Subject: [PATCH 3/9] sql --- .../main/resources/db/migration/V0.0.18__add_is_hand_end.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql new file mode 100644 index 0000000000..609d117f3f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql @@ -0,0 +1,2 @@ +alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0'; +alter table stats_staff_patrol_record_daily add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0'; \ No newline at end of file From 680dcf28561284eb1b73b32f7ad4980ceb83e9ee Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 6 Dec 2021 10:27:20 +0800 Subject: [PATCH 4/9] edit --- .../entity/user/StatsStaffPatrolRecordDailyEntity.java | 4 ---- .../com/epmet/dao/StatsStaffPatrolRecordDailyDao.java | 2 +- .../epmet/entity/StatsStaffPatrolRecordDailyEntity.java | 4 ---- .../epmet/service/impl/StaffPatrolRecordServiceImpl.java | 9 ++++----- .../resources/db/migration/V0.0.18__add_is_hand_end.sql | 5 ++++- .../resources/mapper/StatsStaffPatrolRecordDailyDao.xml | 1 - 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java index f35134647c..247d87f285 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java @@ -123,9 +123,5 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity { */ private String latestPatrolStatus; - /** - * 是否手动结束 手动:1，定时任务传参:0 - */ - private Integer isHandEnd; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java index 5c6d71c590..15b4b8c02d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StatsStaffPatrolRecordDailyDao.java @@ -63,7 +63,7 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao Date: Mon, 6 Dec 2021 10:39:40 +0800 Subject: [PATCH 5/9] emm --- .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index f0682b25b6..6d0dd8703b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -222,7 +222,6 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl Date: Mon, 6 Dec 2021 11:15:40 +0800 Subject: [PATCH 6/9] edit --- .../resources/db/migration/V0.0.18__add_is_hand_end.sql | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql index 08f25e4b2f..adc3d2834a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql @@ -1,5 +1,7 @@ -alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0'; +alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 1 COMMENT '是否手动结束 手动:1，定时任务传参:0' AFTER `STATUS`; + UPDATE staff_patrol_record -SET is_hand_end = 1 -WHERE ID IN (SELECT ID FROM staff_patrol_record WHERE ACTRUAL_END_TIME NOT LIKE '%23:59:59'); \ No newline at end of file +SET is_hand_end = 0 +WHERE ID IN (SELECT ID FROM (SELECT ID FROM staff_patrol_record WHERE CONVERT(ACTRUAL_END_TIME,char) LIKE '%23:59:59') temp); + From 0dcc92426ddfc880c38b9d3ed5f20188d713a395 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 6 Dec 2021 12:42:16 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=A3=E9=87=8A?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...杂症之-数据名词解释及算法.docx | Bin 0 -> 16846 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/test/java/resources/疑难杂症之-数据名词解释及算法.docx diff --git a/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/疑难杂症之-数据名词解释及算法.docx b/epmet-module/data-statistical/data-statistical-server/src/test/java/resources/疑难杂症之-数据名词解释及算法.docx new file mode 100644 index 0000000000000000000000000000000000000000..03055cf214d9e38745aa433489f55889f6e02b41 GIT binary patch literal 16846 zcmb8W19)c3vOgS5Y}>Z2iEZ1q?M!Ujwrz8wiS1Zn`Rx zCLjQSEf4?z{NKs+?d)jXtgW)*bZrCZk%zWY&bZ(=^Ii~2iuJI+mKZZ392J<4gQWAX zH7*>t=*9`JoNiulwD3GOfzi=vpJwu#le&Em_Sxp_EhERMQFPU{>P$N|6Lb^T=p%5h z$=xu%dkJch5R(h`cd`1kRJMjrga&TD`dPHmc4^&)GLO@sQi%mod5F9cgvYrTCOkkd zeA~b;Mb6^}_ZT)TqT$ijjKXZXq$j+hu@{3jH-UyB*83-Wl`iDGzLV>9^0(Xu_yYZ2 zusn$@5Of&euUPruEO$8`j)hlTdw0bwA$_D23RHv{85|0&@WG8Br@4Hu@NS~wP;Em~ zlyern$NE1{wmj&d>MnMC?|r8b*8I~<$RKe1a1)8}Y6`6|NQUpSaGJS}ek_hL+#UIx z$?h5XtOwcJ|GY`}oOR0fOkk(zQce}piQOL~P6gpltf9v|($hSFJr-whJjY{8zLUHh zGU5BDA{32G(^Nkc;qjpegug4o(AL5DmnOc%OUn$1?uOvkaJr zkg>7Eg_pTX>)~!x4Zui{ls!bW3N~4(ukcOiZAu8zGo^hNj6&&0ON=h?eqQUVeVoF<0-;O^2_V+;2!y+jp^D@V_wmgwK_&_P;k zb}pNh@NHq$^O~`SZcQqXUNmv$lDtQJug$RI&1DQ(+fDYy)H{*zEt$}l%kGGb8?iVO zwQqm480r2~3$;EGucRMZfd0?|(m%A|?C4}`{Ywu;anq6m^vENZ0q=riJkn1@noO(F zP3HXET`$0k^+NSmY@g(;|(sOZw<|nWX%~G zYM0%MIcraYD0<<3X(S(X^MA0a#N7G$1sHAfyV-lV6$;;4+QuC-#|HOnP)?^!qj!cs zn~20PI4OOl83Zska;%6GgnfX$T9C0c+XB~Bv7;k6_e!MA?Q;oOh_$IrL>t~})(ot7 zV}-s4gUS&BDM6&ychNUOLT2GD`S5Dccc-vwTGxY%5jzc1z0d+#o#`lyEnX2p7TJPDUeR3$kPM}tU$8H*_K?2e%IBU-)00pAU9 z*^6}jsP6tQqESPKc&YtZ$Ako71~*t|OduHG)p^WT{IX}fI&PWME?zh16;B!{W#n8) z*!%6<-X>gk3K}7daHRsrb&m1H`@=;`k9!CAbi|R`Aud4SqdTJ1i@QAa*Zcb)dbCJ! zJql21{V_~QB>8>=XZm~yD~4^$P)hai!pu>-rEZ&iob2qkFp=pG#>v@Opp=8+3=cG4c#8A+D~` zybx$sQg0nq!vBHo6+fuFgM?57Gr2Q{DreZLs@MAZ{ra8-dELj&@4ac<-c66Hj-jKw zqj++UW*F91Ri`t$IBk@YO%UMNfvoTGC`8HF08>zm22S?H6<#(EvU*=C(LU~U;Ea_i z5jU5TPAVi_~N8*8El99O^~?8ZmIxvA`2>EKduH^ zKGQm}1E1?!$P7}jf!E<1Hwp|Rxkup277_x!U}--sgGJcYPZrGt?BQGpG#ZXsP7;Am z8bX>F&$O$N4G`$Sg|Oqm+OuNshU~!GauR@k@ktE6(UcX723W^QAp&p(I|A?BAm9SB zbH$JOxV8D~*6YWuGI}6-!2o2+Z812QiCApRWC9juYC!`twcy5?T4?b+eGCPG0Y>7W zU}Le6^0IyJU<)Fe;hJa@36wI*Le)`Q=qo}HyE8ZjgyZ0tNw>3pe@*50;A z3&-}QOz3L~MvlykVTmNMi{>OJjK&d8p{{$uXy@UbBWBrIKw_9#(@4h+sy+7*M4L%~ zg4>5>I}S7#Q;8@mw$JfO|S3wOMS)o%A=?mZ4Mf@PscKY#w?#0d|-9^ z*6Oe2RZpH7#&c)KS?=bi2I6ekJc7i*5GAE+Jz#@HZXh%HNmRCzVmPdNhWf6t89I4P z$|rew=!`)3kYo19Rz*=pEGPuIhEge2jmk@Cm)(dg?Fc*(SmwF(;4?j}MDb}Mt0 zN9D+fn4MtqkwL#B52P|8z7Xe>Nc0Ak&WdgzyrF_h+HcAcw2@y3)o&k*7(8C)QL6Qe zQHMkt#7t>#mjQHOYH|Se71~Az~#}s2evio z>oq4L)?-63E!;(-kK9lyy9%L(eB_Qiwz?2@V%;L-%rHdATB?9$Fr zqaTEsXmQhFuCZ{g&TJ16&e<4XpcCZK}E)B-adT6&Ugm^_Ko zNihXknvx=Xr~`S4fG%JxlNOvRo=@1I2<32odNPKr^b3>jS5)I&KLs)*87xVDKQs0^ zlaQN$v#ivm;Za6!^9bb{$slVxr0K0V3JWBp6=D3Q3`-s5?j=N7!eLWZ-pN*g@XbGdiohPLy(j*S3wv=%VZi-=q46Lz=!2fGXg()exhc*{29iU z6hXMDL~D9ojL7i|@G-K`zXl+T%WzW^C*PGms5ciZD6{?`S=rAc_~(8RN$D!6J%lA2X;Q6BPW0YD*Z`;f7Sw#U9R?78s45ar~+##)DHe=7sYL`3cFRl&D0x4rb@27LK? zGc)02bBSw8A;ny4@O0&~ zBH$L$gW(VA;(dxUPoGy{{b0_yhqvxYA$I zl+};tmt;>FT2X8je<)P|urqXP3x9S7wISg+Z(TAc{pRAb`b4Zn&7OfbwM3WsYIfoH zV{eRra?8eN5Pb7yuiZxK1xig57SG(Amt+pRrv69I`%A`~ANXn=WMI-n%q*Kyit3iY z$+#lZ*H_;ZuC`8>VGm{gTXp)7C;FLZ%+GE=l|o81#Vyy$Y*=VqmkNVMzstV?-P0V? zt*oewOkW!_- zI^6+mHe~Y&(dd>Fe}BcOhB^iTAZmhA#Q838r)gVNHvcW7=Gkg-m7$o6MEj?62cwnp z7fWSyRvqb~mhwAR+CI4eoXI|~)vv?AW{j_VZ=Du$Cz3xo=%+lA8`oG5tCJ>i5Y`xi z%?o%dH{yGq|M05++Pj}><(UhAxYIc>e{LE7@Twh+ot(^VO#g72i&P~Y*I41ZU5nrO z2RewlDeMVN#o{Wnmc>aMGnj+~5G~-h0di3umt6Zo4wOPO#AO2RqBh_&58Kw-Dofy-vcJXOd5^PbZijz4A^h7t(=2 zq&1lQQ%Qp6s~pJo@s}+58sENlcEsvnDB26#;ClRUwJ(x(!uB3Y?0Yy$>N(x<8t0yQ z8ffRB1)`bx-}x1Y@55~9c^V2_f#P_Lf%8(n_B71|kMpdQ)2Z>t92?8O%91U>=s!Rv zZ0Kk+kwbdt-6`kZ!TKudhOOSGus`;su!|~?#N#JJM&fomA;T?yC#Jo@a@x;&l6gyC z@Cy|3IRl6Ts%96^3)S2WDu)Xaf15dpeKT}2^EjAcCFp}@0eJK0Z0^_8F@#df!Z*D< z4Y^dL`so&8`VGv$We`xtPi&p6R7n(4*sz>fmR ztGTroyc~RQf2rmSsb3^d_gI*Ys`h zRpatt-MJo)$Piws#~L9e7XFquQ9-AOU&*VQm?Tm5b7cxN?g9AGjC zptT7mVAHH89i#A7h`HWr$iV1?{k*Khp*9vWN63-;5tYZAVj0}vuLkC$SkSrL)QhCi zN5L-JnDu+bGP|ZS4!Hgqr0$7@!KEAhbounmLg#H|SO=%u>#H#p=g)0>!7DdfWOe~f zrzXMR0r*s%MW$CsMmD=5ad{4T)`1x_u{eIwhBelLE&^;(>%#jvBd7uh0o*M6G|)eq zF2P7G5deJRF!NyxxOMl7EkaHR!#cnDJ&ZP`_#k3b3iBUwO?>=I?yuzOFJ5x>Vz-0t zpp861KNbGQdsRPjzdq=Z@Jvm+1xvO;Y&tcgw^X_U9$?bqu@soHI*4^0i^zJ-hVBCL z60hiz5$0~sKyMUCPNR1$6ZuBLT&DxV*m*uRr%CKW)=>~dub_|N{%$2nC!_WPG9kz1 z#?||RmAm{F}k6yrtlCVg5H=um{wp^V%pYm#^db9&TJ3(tSOc-H1)BxM z%r);d20*k?P#4ztW^f#Dq9!ce6ew}qg{FujVfcX^=c_#r&~Ab4E(%fW{a<4lYJ0D$sO!av9v{)lR*OWR_x!FQn@`>LIF)ft@xYA@gQFX74t(id$PflVhRAq3_qi{a=q4kU01{FU z$aq7BdjGx{f~Uow!Pw7m*UO8LQFKy-yQ z-*l@`){IIN|DY3KVCQMbOelEP^>Ti{w8eMVVzSAFTr5^72P`=5InLHB#mtJHf+8R# z9N};YKU)lk1aejyb1Au1ASUKE^HcI^T6e9zKA6>!h*EVK(?$C=W$gg8&rN%JY=ED^ zyhx$yTQk%<=H~;(YQ@WMoK5{Xpt(EnD(UtN-YTw`T;~?iET30ILoQvqy5yU$g5RS^ zzOE_X+U~HB|Ik(MckQ4F&Hu8L3$3f&uS$7)t1{GYDHmKrvvXQ>?owp)L6uL8L6;}F zuqtBNyb8o<;Isr`t3PU$2XdxmC%^_|)|4uAi%W$Z()%|dC9$~t99e6YX=fmUk zaP`nfmqs*Ufku*NetQ@~_wIg^c7NY+xyk*s8ihvsHl4%g`#7R%gKw43k)^uD{d)R1 zuNu?i_PR#|=9N+44{@1*4t2@Ndt+0Fj#^w`z%&B|{poK}CpC@d>n5rLjDg&7W@e6z3oZ|E{y5Y$83q*sVTR&(HBrD>sj=?ql zL5z4_47CMjwp9{_edF(h;E&A)j&>t!`rn$qv+_2^)l$Jb$6gv*e7VL<7ensQx|5fh z^1CF$XcN0D_A=Y$6c8vDluBEIsD-D^z`|a%B=&~;G?;Y<%o$}(oMLo#(-woy6lcw9 zBTO!%y^JePi1b{CE*M65Nt!_W0NCIf`ULC#d2HNii(pyee$2uSt8u=NnGXKes2``T zGdNATr;7rIpt14b^Kh`u)CDcb1I0!@TQd@D zf49OBOFBLSopsP5!h`PX<Y6;SFg8tZdHAFGiUV4=(VRSoEmP=81Nz1471K5HUp%K+zb$QG02)8j5=V|% zA!5NI-mc_A#&>H8&R`S&9RK=7c%W~$-hoeY0TC)!#Rvpe6c@WJ-KPnNRPU23sgQl{ zO=6KpvUb+wkIA3qdKxHl0ccq6Ad^fRa$2givQ@NHO^QaVg!+jY(gLC)_w)#P07naD zBC>*e+KwBkCExN(1mZ^ebLD$pbg93lTh?lR15Hnr;77VFJy~Kcmtz!6WPL@@+SoD7 z6gUTWE)`}DLemo*Yk=`ZH5PA+wIbE5zue0c? z1VV=gymTE`X9fnUA%-HzSlSXW95-I_A}h5d#}Z|ZlG~J*Vwm367>D9~(nJ8>)9f|@ zFGYy&M1U1o(3{HD*l0Y)#0W{!zBeL5;Sgj#;+a=KSzy_qG?}8e1cs{P)=Xein-YLN zpF6usbE1>5F)Vh5Itt2{{M;Myz|np|ff>MW&6_4H&7hO4U$pXAy1``v#qGapo*tC< z)ReaNr4@yzp92RvyX;5chQUJrjG0UIx41<U%-DJ zIz)qBe!==U^TD+Fn;-viUgvCWY~%E2@cUFzaS8R^$MoX8*XVH5d}P+IhLXlb4ccKab;ES%s9mg2i`z~Z3UBiu2i==zJ^JAM>*Bmo!jJ4 zWwgFs6D1Ek%F$Tav3nDezVB;j)=9VF9Yrg9suKYHc;!}5trghP<(Q>ToPrmmvJF&D zi&48&h z2Ns4FZ2KyHIB~D_HY0sOHlM{E1D;s7cv-RFBxo*907T2m!L4S{!O|?UigM!Ru#zBC zXe{x#(PO=&v%1~d>Z(i=h(O7@&p=$En(hz=nGOk`Ln2EDRgd*gDt^^0 zIB&}ecFjc<`|3#OL3@bq3YoGVeqZ1lU%pQVIheP>(~65KE8lOFIb^sp>+@PREqN)A zMBg1V;MT8vvhn#~7-P4UhiZana>q_pE3k1@#a=1*o$ax5CbrCcPOo!b+J^nP8pMjJ)htgU*UsUe(bn*-%T@?>h5qW#I)Jor8KrK1Hw z*;iBnsM$-pls>4?KHrfA6~m}&{?K%2fPn^kVK_zDRR~YZzvyH@dq&867q!J5&1UJT zqbbcsD>R#y`$Z@wI(!GWak1Fr_Hm7n@h3%k!;?>?l{XshqRP>ht&~}W2U_2py+^|lH3M3RoexsVg_=CcHK^bo74p(R2c0;(X<>hh`Dej2*< zQURRU2$>B@asTQB?BVlsln>9%@>BSko|~L+_ar6lW~TwZK^Y!ieYK`tz0!l9^%ZS! z#-?#3#d6>NfGY#etm(iRt(8V+#agrHT-S9m7{0QOFP?M3ll;23;nfQ=5UlJ)d@63`D9B0YDPgQ+|Oego>d&p4wz>YD#2D1?JRni zI+uAFO<61J&(M5mk`1eq8dlbEpmkL;-9@KtHHbYm;bWqoz^3#r=|Xm0*|uzd9#R}= zHLY$Aa2r(i69K&*8hDvQOj1;lo3j=%BHOjafq(>L$C537x7Qk1=+0H~WQlkndVAoA zm<;PBWoSN*wC(Tw;O)TdoCC5)l{?Zm;Z!4uf-KJy!gaifpz@HMu zOn$O{=Dl^S@a3WpB+TnGXW$TQle_d|WvRN29L%TtOm)Nu9b2V)iV-c`zAUeA1KXBx zeRs}Y(vw`UT9m*{>RA(AI{r1)yKgtMF7Y7Q^@Xb7iMg zkm(hm*kZ9xXdXz=r`n?BRUo7Qle#Hd5zDbJj7irAkQhH;!t=6~2r&ffL1N9AYyl7- zxoX4OOjCKp4=A4AY1jRK>QeKLl19+^aGIrG^~uc75zls^css!K*FWZKBLzrZFI2yd zv4S-;JW|UtdjTXAtX7a4aGBi2nKn?ISe2B{l>pqJ8#_e7h;1P@oIdR<+^y3#YBG|l z>7u}O3?2K0t_zdLw%)UPzPMv7kgW{RNxW~@;_*)5n(BD3E-iCtV-$TW>=fE>@xE9t zVSO+HJ&6#+8~iRTf+{(bw@pk`!*t!hH8)9>q@!CgooU8;ICOon=CQ`~xt2Hg1j355 z*E1(YC4V||gciB`vF=Np^>J^xd*YzT2g(2CJ=j_AWdVayyyvb=~+!`IvyF zof+?XSWSar*quDj4RzF_*6dk*3^fl)0#T(_J{|lKu69Gcu2d@_Ml_zB?35aiK7|WM zQu)N^W-qp8$)!uUH_p z#~g=841A6p04|kuBTqN_#}VG`rbl~;Lt)&EYg5(pgeI|8l8`Q8i|6FzDo56Y1}6wE z2}QC)#*pr3)MK}?68b;W^W??V1Ukl^NE`IUO-@YH(Izw)-G4UH8o$nIm`q|4lmXQw z7*>;Y%|B1t8eWb^s8Y~r6eR=QwT*Xf zj8|smUm_g7S3YwK%QIU3hcbF9gWe6$*PWj}zuogZsX`n)3|l*K{O#Orm_$4BPfcYPx+N=2P74L9EdIgN8p zg({%IxyXK2aWr!<&!t>Y~jXgoV4PTC5Lbi;Wj#_Zu;*s_Iw7Zlt zJ=>li{^XQxLAmF@F=SJ|muM&qt&~`<#M4u%+Qp0K@@0><@S*dTqD2X4TJc;k3%)b4 z%?OgvbQSG}7Xt2WUTjRkX;thy;dHGJrmp!2|I0&;?J~<=@=#`v&)TqkhJ13XoxrS} zBpvrR1h}mrJTtqt1&uS@`xk|^(niqNCUWRt4gaPnep_#ACJPsqN1I;0Z(40GP0feT zmhW8(&jT@A@6QsqvP}zH?=Ks&ogpmK@VDTk_D}1{$1!%1PGTZ-uNRWV;aQ+TL+!E| ztqs`8;fTrmn9%TZ*!Svdd%0Q&5?z-ux%i0D<)p)ha2d#XYRk%fjY$H@qBAdUqQm+~ znRT*3u1)6^k1N6^SP0Qh5J2iEw9UatAD(^x0W_o|!IJ?UEU#hpJ|433gv1y04#b`f zv@D*{A6L=g12k|m@|Nn(L*qd9eHXD``zLyF;bW8KE3fVV3yegwd)K*T?Dou3tcG>- z7&L%d)v!&F%|w(D?Q#LZ8rV#Cr#*%i)n2BU5k%F6j>@|+Q3edz5qgelQ*UK3F@pN^ zHSmnGQ{Utk1jiQ@KtsW)7YpW<#)m5F90L-Zp*_gr2Xdr(rN!w&OER=xtD$c}O8diJ zl6&@S@z);K?Bfll9mRAmJ*&Q~*#nkBlgw`9loP20zM{C?*yYqcPrH1DllKf{LszI7 zV+wF^&2`Rs*6)RzEKyU*{H{W+j@d+#KM!swFV0^mCEaUlr_=WcyfHo#18Pp?7yAs1 z!I%_y9IQfC39*r6Luhc+lJzVjfEFFT}{u8{uV z3lFF=MggBptSwx3zF`>DkJLLVWlTA}i0AiiH*xG%k1094$KP+C%CjD2{a7f#Ca5hk zC}e@w7}lUivv$I7<^XYy5GJfdEVQiW#p5fy))jePtSY*B_=GtWH8cS`xOw&Rq|~8y znu{I7_Ab#BC44cbsU8*_eU}P5Fw?^Ix{i+d#pLtgf?cdZp$`cJ6HnAn!rcR+Vi+U( zPZLuB;5`PC#yntZ1D{Bm%mi8VjTSIIvNlLIJ15KVrC9xis>2rjja-hoI11^*)o&5* zjTWHqrbx2&OjIFL#>OF75@2t{y;PF10=^l2;ZClh5t(%LU{?pjSCz*|7|@~(V^(UH zD%DrOD`Gg{^EHVPcPzTxRw|P%pF0m!CSl+PDmqN~wok0G>fE+0^dsFt_ls63W}yZU zv)-PrP$Vrr(=6$GF5!w&NFDpZ1!RT?2Ry^~o}R@VS-~>J)`d48;P-F^p_WhOnN*PV zhc#|;PZg(MRjmeEpVD*q)tA}$Dc&HrhWHA?iX_WqkTpW!5M_0DJ5epOmLUh)cH5Xx zSt??Aye!ngbLZSRo!2ZvR9BVQue~xumR_7^QNQhvCvhjzsUo`!W1WHSRk#{-UiTYx zs_6<>;)4bYZCxG;8jviDq97Z!Ch$E=Tm=5u%_*uDNBJsk50gTJ!d6g29Zfaa4-M6cN}0s($aH#Ky)?I_4ubDi(H^h|$lujDJUoY1qPtkUa(|69reZTt z_z3EVveZ5>e;X~R92<=;yLfFFRe2K=OFK7FDY2h?%locTt9^K#yqAIJ0ixNq)-R0p zdlUfd_?)=q%TM&BuTOmy?fh?PkPxd;9_lPwU|Iqp$dl1~@xE{nXooTF+E0A{dvyL+ z_Mzb)S(|FsR=)-3*L``XlRkb2`bhQsmFD>uow<{-^&g@6tmr<-etLMJk2FvCJDZk; zh(uzZMmN-NaNy?UUtAR1%Vv987q@Iv%glrsnT317$xVJ>>XmhV1^Q>)$WYKz_~3(k(T`c6|BqSxk?sA* zRE%TfEd%M1zifd$!#QlRh@5^ipl*~oK3&$UA<$X#6CWI0Ww_fyV?%fHZqM{=-Qs9j z)n0(tva6pn17!{;_)H^3b{p2WW{HIguQuX50#*>$2d1&S5Cf-d+JfV{&dIbhn+N$K z@Z@fV?sZ|Fc4WO7B%XObAgwi1TX;es6=5Qn^Ml%QVjl`9r;2Bok)4ap2BK~^GJI_` zvb1X@L)`x8z=^QIm`yF#*YSn{lh zz?P!9M5pruAln-szO(RKovQZ_&sUg#ie?jqt{vqghZh(W008krG=Ch8+c;Yr7(09% zj{l0O6(z1&?9syqU!pz1iqxiD=fSKPeE*qWL^4rNZFL8TtR5}wED(QwcF!+81lkWiSAG71s%Ng_qU1heEbn>BLY zBG3`+1ga+U?qFsyb5d-Df{31}q48Z;qkMkq+R9UdMqsm-gj!Vd_sR40}S{26I=q5Jwz=i2iAr^f{JO=8ijJ zUI*_!%;mEQ*i+piYojG$2eOA?iA5D}`&r2*e4kQrHhNeVk%a^HGrE*OFWJez*BkG@ zi!}zX0bN!yrM7NGg?{a3HTIv|6xL7)s2b}0Jkf!txei+H^38W-cT3>F$sng+x*kL z-g|o2{GAK}U51Ly>XdJIX(tzI&*KmnPoodKx?b`!=aa1436cJnpst<5nCwr81nAk_ zQ7aQNw#7chL}=We(3JxRU2kyzTtrEhUA~4NM|cm|e_KQ*wl+>m`UX~io;k^BYJL!4g!`5uOC;V zzDc!gyrOkpMrJvm*;|GbLK);YUl^Hi`@C>ZKX?Dw-dW1lecA5I=P~garJ~zMI-C+ahQ?Wfm@Y4_UTQK+%N?b(;&!p()Vo_R@F71` z1^(V2K6#{QI=r`lDy*VetH%tLD$NmMdZ*QvEsE{i7AZeLz0cv&%Z?S&aYe7(RzOJ$ zG7qDzdtgtBh)$<2K{I>z1gBJ1=~oc!;12or;iSZ_%5o zxa-2a5hSaY^BmPSFORrO`A@2V37yL3ENWxqqPP&FYbjfSo5_BK%&u&K$?QXD5}kg_{Q++nILoD znv3-k;{(qC!Vu`qGNy;9s|LIxI~2uJO0q{oLMmPYLQ`3v%8eq6V9FG%wN&~q zNMc1Jlt{Yos}1BTTF4LNK^eyR>G{zlU?oSXhCJH=GeLm4Flz)-V{3}JWPc8hP70H9 zp2O_RDol?@Z>Q*BLk!z3(OT0_NOQi%Zu@vePL1h$Y$LN=LA^9?lZC(qLw=b%bPo-6 zO$h3Z7HMcsSqzbq`79{m4K9quh!9T?O6;ooh)SI*h zb4$nr(NVIj_BQhHHV4gC=k@Nc#Fk(5k+Z|+4ZA1B6q=%yUdQl|s)6HL6Jn`H-dJR8 z@IFXtrmK zuBoOI6hD-UXx>YLRB+A01kq8DkBPxgUia_ph^*{M0`*HFZc!VhdZRrPU4W2;CWqCB zek9BG>d@@U;*JfZBtDWd`W7W^(<(}vlVI^!hRU~+=+V_p2ufJBV=E{K#?_UZ{n$kL ze02 zIWU@j^>Q5baC8cE%S*Jrf=pJ13Fw3!ev;|?aiMPyMabk4D0o%4Erh{3bujc42D;Cf z=!w-pPRmPmoVJ&hsD8gsuSyV4m&HmPqBZ_)EYu?gXG~dpYxL(laC%(HGA4+*Wi|hq zOr6!+8dqc0f)n1)zPO_>6o*Rkuc@2{ATvu`tH=zkJ=1ijof%IN?=_j&I?5VD z4%(^b){k;ogo6=JwsfAqE0 zRj%q|vjvTawrPw_a#cDu46!N~j4ISiMkEDs$J%w524`C)0)>5mW{{MGm$ei~C5Ug) z^*Z1PBaUmJ)D*~|ndPn)7kts7HDOG0&_KgrwPX|`-pw0y#3wVR2)0uGgvs@$`$K3~ zDQ9(}f-dF#x1;df)1x!D4>96=JlwxFW}1Q@?$*aCxUQ1Bow1|#FUP$pk;}IKV>fdz z@d_8WM9JV(S{~jzGqTJmS5{$f(_5}vZ%h92y!mMqfSjU8n~>y=<7mFEPBfuub_`NL z>Fc3YDvTPCO1r>{@YhXKx)UBrLP$;UbLxF7;5g~wCDnqJVL>S|Ys0U}p>O^_$W!!$ zCNse#sfwUP@VkOR?gf0pL9W*NwxcCY5vYsRJZrCyAtdC@rLvcPx=RW;By-!`FUWHs zZCa9mAd=UpK8kAt;BW;|X=2Y5an(mAM!9QI;@P@<i@xnIPY$DZFQzr%WkB!Trs9S10^M3}(f-bZS;AnENXZ_ZMCRg~@X>|gWiPwGE zp^}retmNx+I9BhA{&pbHx5lB(d9)g3kql3S!%)z$xB_n6;nNXZP>95U*aeRO4?*z8GqBl)2gru`2Aq3+9wpjt<nAJ5qTHQ1jl{DS@(?3ViP#_#{a{i6P}{kpl0C zPmS;YHR+EH;lJ9iNk@J9Pc`eW3IF%i{p-!~XZr;a;rPev;df?#f0O(I{wXQje*!=F z{!fO`-`4zJPw4M?MSt~Ff%PvI{@%y$jQqa+{R=M0@Gtm3Hp9Q;e~-cZg@2>{7ycg+ zncwlhmpA-{-}@*K{vX8-zr%koDE Date: Mon, 6 Dec 2021 13:38:32 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java | 5 +++++ .../dto/epmetuser/result/PatrolRecordListResultDTO.java | 5 +++++ .../service/epmetuser/impl/EpmetUserServiceImpl.java | 1 + 3 files changed, 11 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java index be8e0300f3..e9db8368de 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/StaffPatrolRecordDTO.java @@ -88,6 +88,11 @@ public class StaffPatrolRecordDTO implements Serializable { */ private String status; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + /** * 删除标识 0.未删除 1.已删除 */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java index d59abe39de..f2c9d0c387 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolRecordListResultDTO.java @@ -45,4 +45,9 @@ public class PatrolRecordListResultDTO implements Serializable { */ private List details; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index a131ca29dd..6315daf303 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -209,6 +209,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { dto.setStatus(record.getStatus()); dto.setPatrolStartTime(DateUtils.format(record.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN)); dto.setPatrolEndTime(DateUtils.format(record.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN)); + dto.setIsHandEnd(record.getIsHandEnd()); Integer minutes; if (("patrolling").equals(record.getStatus())) { minutes = DateUtils.calculateMin(record.getPatrolStartTime(), new Date()); From 37d49501aa2ac263bc47a65a965d62643a1ef3f1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 6 Dec 2021 13:53:45 +0800 Subject: [PATCH 9/9] =?UTF-8?q?agg=E7=9A=84entity=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java index f15187a712..0ad2407f74 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/StaffPatrolRecordEntity.java @@ -88,4 +88,9 @@ public class StaffPatrolRecordEntity extends BaseEpmetEntity { */ private String status; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + }