From 1fb272e554f965f71564d8cc8f91a75a060f1637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 23 Mar 2023 10:35:25 +0800
Subject: [PATCH] 'commit'

---
 ETL/Mars/Model/HuiJiModel.py                  |   9 ++++++++-
 .../__pycache__/HuiJiModel.cpython-37.pyc     | Bin 15042 -> 15126 bytes
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ETL/Mars/Model/HuiJiModel.py b/ETL/Mars/Model/HuiJiModel.py
index 62909c3..4df75f7 100644
--- a/ETL/Mars/Model/HuiJiModel.py
+++ b/ETL/Mars/Model/HuiJiModel.py
@@ -27,6 +27,8 @@ class HuiJiModel(object):
     # 根据任务ID获取表名
     def getTableName(self, task_id):
         res = self.getTask(task_id)
+        if res is None:
+            return None
         moudle_id = res["module_id"]
         table_name = self.tablePrefix + str(moudle_id)
         return table_name
@@ -100,7 +102,10 @@ class HuiJiModel(object):
     # 获取任务
     def getTask(self, task_id):
         sql = "select * from t_huiji_task where task_id=%s" % task_id
-        return Db.findFirst(sql)
+        l1 = Db.find(sql)
+        if len(l1) == 0:
+            return None
+        return l1[0]
 
     def expandTaskReceiveOrgsPrefix(self, record):
         r = json.loads(record["range_json"])
@@ -441,6 +446,8 @@ class HuiJiModel(object):
     # 获取填报情况
     def getTaskFillInfo(self, task_id, flag, page, limit):
         table_name = self.getTableName(task_id)
+        if table_name is None:
+            return None, 0
         sql = "select distinct t1.org_code,t2.organizationname,t1.flag from {table_name} as t1 inner join schoolbusinessrelation as t2 on t1.org_code=t2.organizationno ".format(
             table_name=table_name)
         sql = sql + " where task_id={task_id} and t2.recordyear={recordyear}".format(task_id=task_id,
diff --git a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc
index 81c372cb836cc8c170242eca7c2dcafec59bfc54..c3c708f4d9595fdb48f2bdae8981e2d2d2ba3f6f 100644
GIT binary patch
delta 1419
zcmYk6UrbwN6u^5f{d3z==s*g#1sd2&?_farQ=q_7U@9V%f1ME~xXz2LwiNu@vW*o?
zG-@Ql7>_Y#@o#)Edz$1XnwS_96OArWx5TH$@ZyuknE2p}KIl2$7}BJ_`<?Hc^PNB6
zx%aEWTbmW5E|<eZzpJ17^cT<XS2UQtog@}bADD{pA#5u}MK`5Y;n7X=CXAY2a+b3>
zI6wun@r`*xfm6l_+b+N$zN6lSxRJGg0+28oojU-__+EKeg_#`6=s!mP+-XeN0#!|X
zT(L}79;ByM7T;>ce^n1wxN2GjkeOB{*h@4s0=!`smAv*cst6?|6ULb9fvQy!a<T?W
z$pPh*)<xI%3iM&Sdl|CEp8Ep8oA~RA-(UiNs+xm$jh5=a6zIiz&#TTpJ}=4`#(mFo
z&S_o_FwWwc+SiZCgZORj5=>*T?i38*WL*mk8u_{%h{V{M{YvJiQ~7Jh5+7krfHBHy
zOTMs?SrOa@aSlV?mth=ld3{zHZV>Ny18~#$(>no_=#W36D1dqYP3th*C$PExM}Lf$
zc7{sOY{z=CfE5j1xPV%NAIgn~8~PQ9;q!r$a1m!BO%64a%H<QuT)N)46SxgEoJ7gC
zzL8I@XLBWUHo3MU7L8j?LjWWAd-Gs$oTKQBMK*<;s9{0E!z-Qx4W~|iM{$Py?Jnm=
z;SvS8%t0n`?$kf9fbn3)y}-tNhBz$bb}&t<NXy5R?LkYZHO4x5+p@AJS(N43@0BMH
zkoUfX;gFBKra~<+YZO91K=mcIjuR3zGBS#8Jbt<nYWi6rI~(PdjC~e&TfgY!D=)d%
z#cDE}+DdW*xO&Yg<aN!mHIGxtq8HXSa$*{<v^Bvf-e~jr)2#F{cmx+6nU&3zOn8!7
zE5`9|TMRNERh@xaIYcvLp;<(Xt>wlnYVF<d1}?S#+?Bn*OLP6d#ZeRPPrEeZP@)gh
z9X@y)U+MVNdaq_<tTPJK$er+0bOQ(Bpj9?1fsU?zcpt~Q{(yb#>i#-()IU14p3jm2
zWvn2Hlw&3DE?{F%H++WkJrB)o(#Fvzz*4jvega_Lq$|$?$z^-6Z7o`LGf9wFbjzMn
zYoZ-Rx2BccIeOaCib#-!N*0Q4$Acct;fQNWT)y9E@BQVx><ZtVxI)-+2a;Jm@JuGT
zI((hEt$|38LbD!ATl!pOA6Y<%^@npJM<jtGkrDTo^bN_?k?!zAg|9_kn0=JJCK!(~
zIv7tdmKjL~&$LJ}GK@T<z~F|6Ym6<%bw&}BeQhqg>QSpztLjkgs?E63H>0?xSUbt+
hWenrr1CLa0)3T&oUK3&7>mc7+T#Yu-tG*lU{|^oQHDdq(

delta 1318
zcmZ9MVQ5=b6vuP!US3|Bq{hXjF==DArfHtF?bdc_7F*VJ*le}NvQ%8!)tcpH?Q7B`
zz9hAqX$J$H9n`4@hKe6n6hs)(`9N^u7e!$M6%qUpL`1(i+&4d|;61M;76bX^-gE!w
zp7YK*dDmCIs5Xx|98D(vxnli0^TYJ5X1~xJ<lCC*hN%Wyu*Ps)c-bP61e)|8g$V{7
z`T@&TfTMU*`W`0rb?Y|3X}!<34saGfviIX%pTo1CJ19^Cw`q-4OgEs$wjgPe8MZrm
ztuoUDey)XZuCwDo?P0#o@^6`pCXn=Z9p5mB;F9w>Q1v^`S%7QUx&L=Kg-+LLcuUW?
z{$wzSDffmg!acO3gkk){{emq)%P3(4)z;Vd>|-c+<{*LRJe?55S3O-2)3-hA5III_
z@~aCOwQ^x6wGJ|l5(0$d9CdT0TFPg&F*2M$#rq1x@t)Tw8sTDS_XXg6y~j5JJkiy*
z2>Zu`+if3;!=z8*eEWBB4Ey|EID->@uYZQjEe*K&sxF;Z^ZDs?IcL!?`=gBOKMMq5
z9)AgRgGaX?xC<>5y>2O%Dr&J%t_y|qa#l;}_YMvNjAA(WxGhdsW(X-P1icW%jo=-A
z(`s9<!&a)E%d6!@3K7TGI{)IiTn*)&XAC)EH(9YO$B(qG4`2qp;c&N6Bco?lQq2-*
zC}gYl0IiJ+ytF!t%V8h)+6Z^?;kXt47F=nvKgBUE@6%GW$>?uB`UtcP(b}lqP6uf_
zf?s!keu&yycNVpUbV0qCre~!Gm2EpMnIa*LZQZO?mrG?Wf%;<yqehdO%bCSuF+Y8w
zl$}(|74BjrxI`{K0!`*jQ$D+r%^xO(7Dq?VC@j2}=z&&ae4geC*{n6@LYu;D?*MG#
z+r2*}mgx?X$-*8*qcq%V#4}_RN;4+(e|@$n#mVA=T0s1=?-OySKKi9YG2lhNeR!UC
z%iA9kjiM%Tygv%>;HCcia1#pyUxgdB=CRr-!hg*PQC{ZVmf-B*0DO$s2A>$Gr*HhF
z%?d0*&8)CZSQBfavXAee!W3bXwVJqvDdrq2NBOUqW7<isuy6%aBn%yqnKgl_BfmXk
z6pDJPt#Dj)2GRv3a6X@27<q}fCWDrwWW+rw8a^+Qk5R5Lo$t<%F*-?nBXZn+8~B^x
zA%4bRIQVPi^4Ll8I7OHs^bwvV%n_a^*a?e-9HC685UPY#+!}J>r$b?fMRH3nNtBu-
ft0d_6ho+cwk`zx81_{HMh{d6X*Evt%&#~ygU=A=E