From dbdf74e628453d243d38a0956edcbc7843610349 Mon Sep 17 00:00:00 2001 From: Paidax Date: Fri, 11 Oct 2024 16:22:21 +0800 Subject: [PATCH] commit --- .../data/WakesHomeDataRevelController.java | 37 +++++++++++++-- .../WakesHomeDeclarationApplyController.java | 10 +++++ .../nutz/wakershome/model/WakesHomeApply.java | 27 +++++++++++ .../wakershome/model/WakesHomeDataRevel.java | 10 +++++ .../docTemplate/wakeshome/wakeshome.docx | Bin 13048 -> 12825 bytes .../views/platform/wakeshome/data/revel.html | 30 +++++++++++-- .../platform/wakeshome/declaration/apply.html | 42 ++++++++++++++++++ .../views/platform/wakeshome/info/apply.html | 27 +++++++---- 8 files changed, 167 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java b/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java index 47ef943..92de922 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/data/WakesHomeDataRevelController.java @@ -9,6 +9,7 @@ import io.v.nutz.base.utils.Roles; import io.v.nutz.base.utils.Vi; import io.v.nutz.modules.models.PageForm; import io.v.nutz.sys.models.Sys_file; +import io.v.nutz.sys.models.Sys_union; import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.models.User; import io.v.nutz.wakershome.model.WakesHomeDataRevel; @@ -31,6 +32,8 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -71,7 +74,7 @@ public class WakesHomeDataRevelController { Sql sql = Sqls.create(""" select un.*, - (select count(*) from wakes_home_data_revel whdr where whdr.unionId = un.id $revelCount) as revelCount + (select count(*) from wakes_home_data_revel whdr where whdr.belongToUnionId = un.id $revelCount) as revelCount from sys_union un $condition @@ -142,7 +145,7 @@ public class WakesHomeDataRevelController { @At @ViReturn -// @RequiresPermissions("wakeshome.data.revel") + @RequiresPermissions("wakeshome.data.revel") public Object doAdd(WakesHomeDataRevel wakesHomeDataRevel) { User user = dao.fetch(User.class, Cnd.where("id", "=", ShiroUtil.getUserId())); wakesHomeDataRevel.setId(R.UU32()); @@ -154,6 +157,13 @@ public class WakesHomeDataRevelController { wakesHomeDataRevel.setUnionId(user.getUnionid()); wakesHomeDataRevel.setUnionName(user.getUnionname()); wakesHomeDataRevel.setTime(DateUtil.now()); + if (StrUtil.isNotBlank(wakesHomeDataRevel.getBelongToUnionId())) { + Sys_union union = dao.fetch(Sys_union.class, wakesHomeDataRevel.getBelongToUnionId()); + wakesHomeDataRevel.setBelongToUnionName(union.getUnionname()); + } else { + wakesHomeDataRevel.setBelongToUnionId(user.getUnionid()); + wakesHomeDataRevel.setBelongToUnionName(user.getUnionname()); + } dao.fastInsert(wakesHomeDataRevel); return null; } @@ -161,7 +171,7 @@ public class WakesHomeDataRevelController { @At @ViReturn -// @RequiresPermissions("wakeshome.data.revel") + @RequiresPermissions("wakeshome.data.revel") public Object doEdit(WakesHomeDataRevel wakesHomeDataRevel) { dao.update(wakesHomeDataRevel); return null; @@ -171,7 +181,7 @@ public class WakesHomeDataRevelController { @At @ViReturn @Aop(TransAop.READ_COMMITTED) -// @RequiresPermissions("wakeshome.data.revel") + @RequiresPermissions("wakeshome.data.revel") public Object doDelete(String id) { WakesHomeDataRevel revel = dao.fetch(WakesHomeDataRevel.class, id); if (revel != null) { @@ -183,4 +193,23 @@ public class WakesHomeDataRevelController { } return null; } + + + @At + @Ok("void") + @RequiresPermissions("wakeshome.data.revel") + public void exportAllFileByUnionId(String unionId, String unionName, HttpServletResponse response) { + response.reset(); + response.setContentType("application/x-msdownload;charset=utf-8"); + + /** + * 创建临时文件夹 + */ + String tmpPath = "tmp/" + R.UU32(); + File tmpDir = new File(tmpPath + "/" + unionName + "附件汇总"); + tmpDir.mkdirs(); + + List query = dao.query(WakesHomeDataRevel.class, Cnd.where("belongToUnionId", "=", unionId)); + + } } diff --git a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java index 45bcda9..770370e 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java @@ -2,10 +2,13 @@ package io.v.nutz.wakershome.controller.declaration; import cn.hutool.core.util.StrUtil; import io.v.nutz.annontation.ViReturn; +import io.v.nutz.base.utils.Vi; import io.v.nutz.wakershome.model.WakesHomeApply; import io.v.nutz.wakershome.service.IWakesHomeApplyService; +import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.nutz.dao.Cnd; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.random.R; @@ -77,4 +80,11 @@ public class WakesHomeDeclarationApplyController { return wakesHomeApplyService.findById(id); } + + @At + @ViReturn + @RequiresPermissions("wakeshome.declaration.apply") + public Object getWakesHomeUnitInfo() { + return wakesHomeApplyService.fetch(Cnd.where("unionId", "=", Vi.getUnionId())); + } } diff --git a/src/main/java/io/v/nutz/wakershome/model/WakesHomeApply.java b/src/main/java/io/v/nutz/wakershome/model/WakesHomeApply.java index 543e720..86450a4 100644 --- a/src/main/java/io/v/nutz/wakershome/model/WakesHomeApply.java +++ b/src/main/java/io/v/nutz/wakershome/model/WakesHomeApply.java @@ -1,12 +1,14 @@ package io.v.nutz.wakershome.model; import io.v.nutz.base.model.BaseModel; +import io.v.nutz.sys.models.Sys_file; import lombok.Data; import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; import java.io.Serializable; +import java.util.List; /** * @version 1.0 @@ -100,4 +102,29 @@ public class WakesHomeApply extends BaseModel implements Serializable { @Comment("申报时间") @ColDefine(type = ColType.DATE) private String applyDate; + + @Column + @Comment("创办时间") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String foundTime; + + @Column + @Comment("单位位置") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String position; + + @Column + @Comment("单位面积") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String area; + + @Column + @Comment("单位信息") + @ColDefine(type = ColType.TEXT) + private String details; + + @Column + @Comment("附件") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; } diff --git a/src/main/java/io/v/nutz/wakershome/model/WakesHomeDataRevel.java b/src/main/java/io/v/nutz/wakershome/model/WakesHomeDataRevel.java index 6b2e6ed..e6994d3 100644 --- a/src/main/java/io/v/nutz/wakershome/model/WakesHomeDataRevel.java +++ b/src/main/java/io/v/nutz/wakershome/model/WakesHomeDataRevel.java @@ -68,6 +68,16 @@ public class WakesHomeDataRevel extends BaseModel { @ColDefine(type = ColType.VARCHAR, width = 100) private String unionName; + @Column + @Comment("资料归属分工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String belongToUnionId; + + @Column + @Comment("资料归属分工会名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String belongToUnionName; + @Column @Comment("上传时间") @ColDefine(type = ColType.VARCHAR, width = 20) diff --git a/src/main/resources/docTemplate/wakeshome/wakeshome.docx b/src/main/resources/docTemplate/wakeshome/wakeshome.docx index 92def595ef81291b9444a203762a1f67ef9c969d..53dd7cb3c380a482d845cc43ac9816ec77bdf788 100644 GIT binary patch delta 6715 zcmZ9Rbx_oA*T$C?Sddt{8|m()yBn59LXZ+9CBEb?AiaQqlpsh8A|+kY4T5xsbce+I zd*0`rx6U8upEKvWXYQG6&YaJ=amch!62<^S#)ut~C8&WEJ&$lcNYu)Q0~vzlPoV{k z7R_QJdFdmH*@+qkRg>WP;!5SGhd~SKwxh$`z^=6+XjGrUET)Q(F}wKlDKTucRErt; zqn)*4Gi4=m(?0tVGZs(U+zEK%#UsA4va^tOK3-7d_w#B`Z5e`>0TDE{H4R06zJuPw z0nS&7hrU4gM(sKRzlaHzqWLVBdXREo)f%l^W4(LgLG-(E%T6ub3@p$Fhs5`X1OA?Q z;?&PNFPfx%Qe)S|bVpepG}p9JZth}P9^zCy!8l2PT_S5!7L(E{>Vl37g&XzO`~ujs_ATVRTs(ieYZyXVGH!INq_~zX z{EfHM5f=5Ua&`E2a?iI8e;J6q)vTRs4;AD7wzv5$0y=GjSAAKp+!T z5ONZQ6o^WhQ19l0z>hIjK5e#XO-j&wI+S%V!AEC{^?$eT9z@WSPtcGDRb8GZ~6zd)= zOIM`XKC)%=W|wk5a5ZdZPXAQtfr>F7!>NS zTYbf0TkDKA;NI_ErgVSoUTP%eKe2IwKPDxJtguGVQg7NzRO+ijQNs-7MRVqhPMi%s zJwvr~nVD`i7Kl=DUX^HWQ>SHx4i5NEf)Ki_QGqUfBtMl8wsfh+dIwo5bK&zpyyk6} z>Vcf3DAIHKwBEQRg7?2oq4}q{SYs_SosT5Hojkt@E{u43|A3ug%Y^$@TOzv}82jHd z(xbd|$YxS!SE-@nC5(Ayo4sWeWYDI-mzza_UPin4$1m|3e_^=mtZDyaWj6Jljmg8! z%Y#&YB0j~;9rxXdXzp%w0D;{mc0cvAeU5!`dx37_1t&~tL#c6fCVW$ASYgE)F1_

j~R432!vhop)pF5J*3*h6&yV2cM5)CEvJlJTO z8y?@7qV|ouV{ou4+|DImXkEM@d?VARWAJYOArELNFUE1fbA1isXw3TN>UdbkQ(Txl zc$LB6!-4}0qb%YKB*Ar>sQ8(!2VZ7j8`EovL=pv)H`UXaRZ{ZTst=C>aY3`?z^B^JCDVn*{2YXjA>QbR$@AGdR1erMIFuyy573 zqudP8y@C(ED&PYXxopN||OSW^*B06qb`8GkrcFH35m0%fv`HTzQoZ{3v~4MpKxo_}nLP+73WkseIIQ>MYTjj3kJ^Wc zjZ4ab^(sUT1Wqo}n8fX`DnyiXyN8Z1i-K5s*5zLln zhw$Q4@+x7o2z_Z+tGX68aOdzsOmJG|A1LX4zIt1WcwPPZIZ?6%9p0yHt6*Lm^P<3S zGuG8`BmMJ&dkV_Kgf~GE1MXiv#O<@|-$AsE{dVcqEzd=oU%1s%q4yI;jJ_^8{AuA@0jk{ddo)Ek8!Qou$KdB7 z+n{Y$VLDqs8ETwt8+2G?<+xl6jPeg*b$PRo|KW*;CdQdX?hq`A_`9-^S1lR(g4 z^I5ZFqEbtIZsEVJcmV)$rPiN(8}M&GrModZE1-j0t5Z@5%E&r|q#E&GBzLkn7?* z3vR&jJTM|sd|cQ6=_%Dm!J9(c)9}!N&j#(c&yIYrG#xR#)Zvp3rERPy`@ITu6~*mq zGxDBn(Ax7~wHU2l(w{D#AK3fE_*;?R4YVvx?ND5{C_xm}5@~qjXkG~)#q_;rt3fN~ zIlQ?NJMHUi#PUoj`goy)b14*dW#6ZhQuFbGA?y%iLf}s_HYu)X+@kM(o(g48vfCIL zbOxVB<|@0SZ+|?qN00i#o{bu4W=Lgkj1!_(sX4xd{>I+pP;nLq}Nnfw=EhwoLy^`_8|0*!@=O~CC_QSvBs?Gk@h>l9RIgQ)X-D6 z-iLq^n*hAT#DW@QHAA7l)q*=WA?1m08i!3)Otx4LKZ~_|AEoyn2ntG5UfWI0eOWm6}~RD>k$gt zI%)eVBO=+*yGR+q8!Qilt>mJp(ciNjDLArS%wf!@7Dx>8aC9t*!n0J`cYx$!{P5CaHD1LQ?L$~T^j zsYB2F7xU}#$>?e@&p6b*bnm6ue5!O2^ItCy6_OB@&WNf!?W;aWat?IMdaj8Mq7-Au zY*w>n8c^NCdA9s^47#)UHe}~yJI&;)&(dHOjdH@VaM=N+LFHWTRs)U47ro&9SkF&@ zaiwC-UY*wL^?|a_SVGxX_xlUBuNV7nD}Q|4c&lW|tPGE_j0@*uHuBrrXkj$XF3K*J zeK-&OD+#k)?afCX9+K&;%h%mk5`ER+N7BeP2NlA&FPY0#6h_W|O9RXI9alCLZZZd1 zp5M0-lKYl|E%UfMvd3W*lI98fJ%QtZC=<)lP5f)#i$AIPxC-IpOg{1i530G(*c_7u zc>?smP$$*a?aF!Lx>Dw&HEn7noht?fP7;-E!&_9+~!W_gT5ABc(y9J-z%SLofC`@Z~JM z`wS{z5908l#t4931a>B6cZgegkhPX~ww zF2#-5wm*abm2`?O=_+^w(N{J168EXnhLzrxcfB-Y&quh)wtu~fQqLpdRFx~EvT3fr zzoNYZ=fg^{9G$FOBW?{~S|9KLk`*Eg{0W-&8jgp%sy&f1(m4sqimJk2N%!QGZDcBM z6#7orm1jf>P2;I+akw4r#Yai_BKU%4QPjdh97t^m3?PU1XkH^WQ;LGgZ_ci1hfGM~uRa;=4 zD0+3>Krvp#UA8!jMY z{kRYMl^e=KMyzN2VTAt8HT^VgqIE*yP_JPEmv&94{U(F8t-qx+PD)k`idA(Ngn)4` z?sfE8iKRG+yjU_I?A;WQ!pfY-l+r_`kDS%cVX9!LsbGI~e{KMylrzkV`{{6%Yrqh> zWBVcbmSvn0K8umLrDLs(4jVUe_my(&k{LY^S7l0QZqna?jS5C+B95DJeMbZg6lqsi z7yjzdE>TG}3f`PsuML5(%#2}5uSl*Sq*BXX$%SZi_71@6kYmfvyqc`SE#63bcyUN! z8J{d$Q2aION&mvECK1Y(Lg$Go@g#bZe0RhR=ml|5+E2AN&bL+1ompzh{+2B4N+??1 z;CkLtOt!js^f}}$o!NB^4N22TNajo`NP-+14n+qOv}m6kn)>7xe$KUTSqWU<(`Mnp zpgk9EY^(qm{G;%K58w#jGwXb(Fe%s++&JegylRr(Gh)}px9Q(`j;(_$L7)0OhT((4 zX%N(VKDvwMW;%$hL}95PtWlioOzJQFCCyG;ydjh9EQP!l{A!F-t%$=1;Yf0JjmKfW@Mg{)1Ot~L>nC`D(>Jo@ao#oO?`hQ+GEZ4j z5sauGUj-+(utH&`q}*i+zq}0+gq#HVpycm2yZXtS%k~ezR8x_3l!&YB5ppkO4Sl>Y zW)ft4UQ*Ia^VRD$(_kSpR=06pRyt`UVuH)j6K`jawq%9;ego0j4rp8*79vD3k3({5 z0q2c?^!?sHxzO; zN3iiQdUHVW>ynvs_9L}9jDrE0+asHkrJY_%b)Clh`t%l23WxDw@;< zufGYzas82hdv&m!;@mgocSIfR^TvB;|BH2yzOrPJbt~vF$)T>d97gX_MAK8wfra!A zW+$alX-UQ;KE{fp(NC6Qi{?i+#mgbTHzJQLc;#wnqOHrLAKK%D?nD2fdt4mb3K;b# zXZ{1PdiD}?MC*_kM<^yvime(&BW8$|YNq?|igds|nZ1N(>86vyx7NgZm~NjeUFWxG zlm`36S@H{B?9LS9XF_Zd0*ja$hK%gyJoCx8Ai|Zkz9)(MCGO};`t?AslgC<>;~22u z&HWKF;%|hX2Q=^kkqyOjwZXhv0~Gb9#G%CN1t(Z#vNogUBB>h+B|IDRL|##Uv~1)+ z1_&w(i=eJ<)Nx$Oc_yyZc|60C@HK(Rx;4ZJNu>_q-eeB$Zwjd(8P02G1&(WHs+7QY zN>LQ1F(~mbPkHur+%uEyEHC;O$aEi)%@1RT7gAddjKz&iI_f?*u8reY0elxlUE?Mo z)RYZm7{RBYQ2y5fVKXmqGLCXyV2Yy?{A66|;bC6*J&wwS_UC3JK2gvdtoagsHJfct zL2`Z#0ic22o@`-7AXYT@d~Lz%hU^b)HF>&jr@Gl+|N%R&^09}@~|^81#a~sOzbm5D;#pc-y;70C2g6fL_l#{ zH{Ma`e$dCy?|4?hSmo8P)^v>{)tScjUI;D)Y2yAxxju+HK2bxI1T;;&2{Up@N#&Ny z0~f&vk$EviNP4k4q1|RDLC5@tmInsWYQHgi+^{^se zpvoBhi2ZUWMpcn~0ytWjz?zJS4Vesvq)xw4m~{KEoLmaVZq;Dpe>^Kj7t6l$d-ZFL z(?K`!Xi2K&wsQ*WcypKbs$LB)EvmzNu5OjK;ZK5&(Yv$!TQSVd3$A}6a!M^7yk3)c zycz5mHsMV2XyiRP;^+!5`8E?)%W?9$;69}AZh!Wn*x8ar@1ObOf!qG1cGNQ|qCqWC zYnqOpyw*=U^|orm&THCgA!b(d;(8}6Vwr6ikNxLJqM-|A3M-QGJ9ZNE%fG2fJ1U=%JB z-F1+@JkY{|N04cV`=k|Hd@}6ud54k&9TLR-c|aDW&mYU|WrsZgDH3Q{BM@Srrl%)q zE4ZW$)eD2>U(!yVgii;~&1$|UMJdW1IaZf=IARD%mkaQZ}XK__a_FFmW{ zDpcd90j_XbHWk{bGZHa*zLapJ>njm57Q)VlS=JtRM^i;d?_|Q%xP>&zn*ig-E&gMT zHj`xal;Q0hZfxqQ(HyDXE~*6G!8E3-)F$9Gfmzb6} z@OD#*DkE6H^G1Et9KkyPP}ZCR|Cg>Q)(1QvLIr_la6llUf4HWfhnGFCqldem32SI72{gq^2x0@@mr5K*@Bz%QEid0c;Et*kyuClyZy_HuQ=i7_^ZrMy;=K%DF-ccnliQ=|4N_R$)72;pKc`}dsK z7c+2SznD1$puyo^XR1`UzklYk44E>zPk-%>buJ9oS?wK;djnrZu5JowB_$?-iwJ65 zC}M2b+e2xq{%rEBd*RIX6(vbEh!ccK4{?aT+I{gosz2{I4|uwpM?puS=L5+an{X2B zIa3jM|6-?G>98GEmnhG2BVVizy`ubQ1Aj}k6plg;v=GC|WBYCSfX z+l`suTsWy#Tn9fX+y#HduIVaHBe-_{F2leR_Qi-3hp-J*x<{Mdm|5=wpDGoO<7oUT z?-f&zuq=UPpmc;j2+p9G^4+gaDf*E|-c)22&vLWcbzFO@=sh6Qe(+0)uG$~pvhgdq zr8q1QAlII>%>|ziA^4Km#(Q-~gkH^?IbyL9ogmumB7}!-=(V2-JDN#jzF1H5sHi(d z|LosDz%;{?K$}g14x$%Bd8v4kdJ_zl5;o&5*q@#|Oi%AxCd~cK1pmIyG$Ki!+-x^> zi}t2)ip4B(tlJWGv-OZjFPnOo=nAszjZIZe;_^Y`{^4rF*<$^TgH){!SMXH!zxMT7 z3{FvW)O;?aG_MQ_7#YGVh|0%-tmQTQ_ca9x<`bv-UuYjh_>VFE6(}J3fASBc4IeZ0 ze`4u>&_Cfn<{|!9@t^p2of{1)hem>|kG(m#>gvyrf8eeo9n;6RE|| zL-jwj;2)iTOZ=CHJu;o2nd<+W^MBqTM9%QDQ2jUH#ryyL!AKGTX_RuLp@0<1BQjY) R422CjD8P;>$n!6a{{Y9?br%2t delta 6961 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 diff --git a/src/main/resources/views/platform/wakeshome/data/revel.html b/src/main/resources/views/platform/wakeshome/data/revel.html index 9c16ce7..d384973 100644 --- a/src/main/resources/views/platform/wakeshome/data/revel.html +++ b/src/main/resources/views/platform/wakeshome/data/revel.html @@ -79,7 +79,11 @@ layout("/layouts/platform.html"){ - + + + @@ -87,7 +91,8 @@ layout("/layouts/platform.html"){ - + +