From 6881a944add518c94ca284cdf77354f4f2043182 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Fri, 28 Mar 2025 15:44:48 +0800 Subject: [PATCH] commit --- .../activitybx/ReimbursementCon.java | 24 +- .../activitybx/ReimbursementViewCon.java | 3 + .../ActivityReimbursementApplyController.java | 71 +- .../ActivityReimbursementMineController.java | 2 - ...ReimbursementSchoolChairmanController.java | 2 +- ...vityReimbursementStatisticsController.java | 6 +- .../zhgh/jf/service/ActivityBxService.java | 2 +- src/main/resources/docTemplate/funds3.docx | Bin 0 -> 15064 bytes .../components/activityBx/ActivityBxInfo.vue | 1014 ++++++++--------- .../platform/jf/reimbursement/apply.html | 201 +--- .../jf/reimbursement/clubChairman.html | 3 +- .../views/platform/jf/reimbursement/mine.html | 4 +- .../jf/reimbursement/schoolChairman.html | 3 +- .../jf/reimbursement/schoolDirector.html | 3 +- .../platform/jf/reimbursement/statistics.html | 4 +- .../jf/reimbursement/unionChairman.html | 3 +- 16 files changed, 610 insertions(+), 735 deletions(-) create mode 100644 src/main/resources/docTemplate/funds3.docx diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java index ecf635e..482f3f3 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java @@ -11,6 +11,7 @@ import com.deepoove.poi.data.PictureRenderData; import com.deepoove.poi.data.PictureType; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.model.Audit; import io.v.nutz.base.model.Goods; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Html2Text; @@ -28,6 +29,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.boot.starter.ftp.FtpService; import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; @@ -271,27 +273,29 @@ public class ReimbursementCon { /*基层工会主席签字*/ - if (one.get("dc_s") != null) { - one.setv("dc_sign", getImage((String) one.get("dc_s"))); + if (one.get("reimbursement_union_audit") != null) { + Audit reimbursementUnionChairman = one.getAs("reimbursement_union_audit", Audit.class); + one.setv("dc_sign", getImage(reimbursementUnionChairman.getAuditSign())); } /*协会负责人*/ - if (one.get("ap_c") != null) { - one.setv("ap_sign", getImage((String) one.get("ap_c"))); + if (one.get("reimbursement_club_audit") != null) { + Audit reimbursementClubChairman = one.getAs("reimbursement_club_audit", Audit.class); + one.setv("ap_sign", getImage(reimbursementClubChairman.getAuditSign())); } /*校工会主席签字*/ - if (one.get("ucc_s") != null) { - one.setv("ucc_sign", getImage((String) one.get("ucc_s"))); + if (one.get("reimbursement_school_chairman") != null) { + Audit reimbursementSchoolChairman = one.getAs("reimbursement_school_chairman", Audit.class); + one.setv("ucc_sign", getImage(reimbursementSchoolChairman.getAuditSign())); } - /*会计*/ - if (one.get("a_s") != null) { - one.setv("a_sign", getImage((String) one.get("a_s"))); + if (one.get("user_signature") != null) { + Sys_signature sysSignature = sysSignatureService.dao().fetch(Sys_signature.class, Cnd.where("id", "=", one.getString("user_signature"))); + one.setv("a_sign", getImage(sysSignature.getData())); } - /* // 基层工会活动 if (one.getString("activity_type").equals("1")) { diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementViewCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementViewCon.java index ec0bb90..eac9e31 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementViewCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementViewCon.java @@ -15,6 +15,7 @@ import io.v.nutz.zhgh.jf.service.ActivityBxService; import io.v.nutz.sys.services.SysUnionService; import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.utils.ShiroUtil; +import net.sf.ehcache.transaction.xa.processor.XAThreadPool; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.boot.starter.ftp.FtpService; import org.nutz.dao.Cnd; @@ -29,6 +30,8 @@ import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletResponse; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathFactory; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java index 3a938ab..eaa1a70 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java @@ -4,7 +4,10 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.sys.models.Sys_signature; +import io.v.nutz.sys.services.SysSignatureService; import io.v.nutz.zhgh.activity.models.ActivityTissue; +import io.v.nutz.zhgh.activity.services.ActivityTissueService; import io.v.nutz.zhgh.jf.handle.reimbursement.ReimbursementToHandler; import io.v.nutz.zhgh.jf.model.ActivityBx; import io.v.nutz.zhgh.jf.service.ActivityBxService; @@ -20,6 +23,7 @@ import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Lang; +import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -46,6 +50,10 @@ public class ActivityReimbursementApplyController { private Dao dao; @Inject private ActivityBxService activityBxService; + @Inject + private ActivityTissueService activityTissueService; + @Inject + private SysSignatureService sysSignatureService; @At("") @Ok("beetl:/platform/jf/reimbursement/apply.html") @@ -58,34 +66,31 @@ public class ActivityReimbursementApplyController { @ViReturn @RequiresPermissions("sys.jf.reimbursement.apply") @Aop(TransAop.READ_COMMITTED) - public Object doSave(@Param("activityBx") ActivityBx activityBx) { - List budgets = activityBx.getBudgets(); - if (ArrayUtil.isNotEmpty(budgets)) { - double sum = budgets.stream().mapToDouble(ActivityBx.Budget::getActualPrice).sum(); - activityBx.setActivity_money(sum); - activityBx.setReimbursement_apply_time(DateUtil.today()); + public Object doSave(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) { + if (Strings.isNotBlank(sign)) { + activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId()); } - - activityBx.setFiles(null); - activityBx.setActivity_content(null); - activityBx.setReimbursement_state_id(999); - activityBxService.updateIgnoreNull(activityBx); + this.setEntityValue(activityBx); + activityBxService.insertOrUpdate(activityBx); return null; } - - @At - @ViReturn - @RequiresPermissions("sys.jf.reimbursement.apply") - @Aop(TransAop.READ_COMMITTED) - public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) { + private void setEntityValue(ActivityBx activityBx) { int count = activityBxService.count(Cnd.where("id", "=", activityBx.getId())); - switch (activityBx.getActivity_type()) { - case 40001 -> activityBx.setReimbursement_state_id(1020); - case 40002 -> activityBx.setReimbursement_state_id(1010); - case 40003 -> activityBx.setReimbursement_state_id(1000); - } + activityBx.setReimbursement_state_id(999); + ActivityTissue tissue = dao.fetch(ActivityTissue.class, activityBx.getActivity_id()); + activityBx.setApply_time(DateUtil.now()); + activityBx.setReimbursement_apply_time(DateUtil.now()); + activityBx.setUser_id(ShiroUtil.getUserId()); + activityBx.setYear(DateUtil.year(DateUtil.parseDate(tissue.getApplyTime()))); + activityBx.setActivity_name(tissue.getName()); + activityBx.setUser_name(ShiroUtil.getPlatformUsername()); + activityBx.setActivity_type(tissue.getType()); + activityBx.setProjectTypeCode(tissue.getProjectTypeCode()); + activityBx.setMobile(tissue.getMobile()); + activityBx.setProjectCode(tissue.getActivityCode()); + activityBx.setActivity_content(tissue.getActivityContent()); List budgets = activityBx.getBudgets(); double sum = budgets.stream().mapToDouble(ActivityBx.Budget::getActualPrice).sum(); @@ -97,11 +102,24 @@ public class ActivityReimbursementApplyController { if (StrUtil.isNotBlank(activityBx.getId()) && count > 0) { activityBx.setFiles(null); activityBx.setActivity_content(null); - activityBxService.updateIgnoreNull(activityBx); - } else { -// activityBxService.doAdd(activityBx); } + } + @At + @ViReturn + @RequiresPermissions("sys.jf.reimbursement.apply") + @Aop(TransAop.READ_COMMITTED) + public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) { + if (Strings.isNotBlank(sign)) { + activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId()); + } + this.setEntityValue(activityBx); + switch (activityBx.getActivity_type()) { + case 40001 -> activityBx.setReimbursement_state_id(1020); + case 40002 -> activityBx.setReimbursement_state_id(1010); + case 40003 -> activityBx.setReimbursement_state_id(1000); + } + activityBxService.insertOrUpdate(activityBx); NutMap map = new NutMap(); map.put("userId", ShiroUtil.getUserId()); //流程开始 @@ -171,6 +189,7 @@ public class ActivityReimbursementApplyController { @ViReturn @RequiresPermissions("sys.jf.reimbursement.apply") public Object findOne(String id) { - return activityBxService.queryOne(id); + //return activityTissueService.findOne(id); + return activityBxService.fetch(id); } } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java index 748cde5..715b3bf 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java @@ -61,7 +61,6 @@ import java.util.List; @At("/platform/jf/reimbursement/mine") public class ActivityReimbursementMineController { - @Inject private Vi vi; @@ -77,7 +76,6 @@ public class ActivityReimbursementMineController { public void index() { } - @At @ViReturn @RequiresPermissions("sys.jf.reimbursement.mine") diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java index 58c2d2d..1360489 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java @@ -87,7 +87,7 @@ public class ActivityReimbursementSchoolChairmanController { activityBxService.dao().insert(audit); Chain chain = Chain.make("reimbursement_school_chairman_id", audit.getId()); - chain.add("reimbursement_state_id", audit.getAuditPass() ? 1061 : 1045); + chain.add("reimbursement_state_id", audit.getAuditPass() ? 1060 : 1045); activityBxService.update(chain,Cnd.where("id","=",id)); ReimbursementToHandler.COMPLETE_SCHOOL_CHAIRMAN_TASK.exec(id, NutMap.NEW().addv("nodeName",audit.getAuditPass() ? "校工会主席通过" : "校工会主席拒绝")); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementStatisticsController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementStatisticsController.java index 94462f6..9f83567 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementStatisticsController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementStatisticsController.java @@ -1,5 +1,6 @@ package io.v.nutz.zhgh.jf.controller.reimbursement; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.zhgh.jf.model.ActivityBx; @@ -41,7 +42,6 @@ public class ActivityReimbursementStatisticsController { public void index() { } - @At @ViReturn @RequiresPermissions("sys.jf.reimbursement.statistics") @@ -66,7 +66,7 @@ public class ActivityReimbursementStatisticsController { cnd.andEX("u.unionid","=",unionId); cnd.andEX("u.unitId","=",unitId); cnd.andEX("act.clubId","=",clubId); - cnd.andEX("act.reimbursement_state_id","=",1061); + cnd.andEX("act.reimbursement_state_id","=",1060); sql.setCondition(cnd); return activityBxService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(),sql); } @@ -77,7 +77,7 @@ public class ActivityReimbursementStatisticsController { @ViReturn @RequiresPermissions("sys.jf.reimbursement.statistics") public Object getActivityTypeNum(Integer year){ - List list = activityBxService.query(Cnd.where("`year`", "=", year).and("reimbursement_state_id","=",1061)); + List list = activityBxService.query(Cnd.where("`year`", "=", year).and("reimbursement_state_id","=",1060)); Integer schoolNum = (int) list.stream().filter(v -> v.getActivity_type() == 40001).count(); Integer unionNum = (int) list.stream().filter(v -> v.getActivity_type() == 40002).count(); Integer clubNum = (int) list.stream().filter(v -> v.getActivity_type() == 40003).count(); diff --git a/src/main/java/io/v/nutz/zhgh/jf/service/ActivityBxService.java b/src/main/java/io/v/nutz/zhgh/jf/service/ActivityBxService.java index a85079a..8682e58 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/service/ActivityBxService.java +++ b/src/main/java/io/v/nutz/zhgh/jf/service/ActivityBxService.java @@ -41,7 +41,7 @@ public interface ActivityBxService extends ViService { LEFT JOIN `user` u ON act.user_id = u.id LEFT JOIN sys_unit un ON u.unitid = un.id LEFT JOIN state s ON act.reimbursement_state_id = s.state_id - LEFT JOIN activity_basic_settings abs ON abs.`code` = act.projectJfCode + LEFT JOIN activity_basic_settings abs ON abs.`code` = act.projectTypeCode LEFT JOIN sys_club sc on act.clubId = sc.id $condition """); diff --git a/src/main/resources/docTemplate/funds3.docx b/src/main/resources/docTemplate/funds3.docx new file mode 100644 index 0000000000000000000000000000000000000000..c03c1760b533aee9e8cb4d811e9a1cfff9efdc20 GIT binary patch literal 15064 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 Os1xtk(arvC>_ml4AN literal 0 HcmV?d00001 diff --git a/src/main/resources/static/components/activityBx/ActivityBxInfo.vue b/src/main/resources/static/components/activityBx/ActivityBxInfo.vue index c23bd38..de394a6 100644 --- a/src/main/resources/static/components/activityBx/ActivityBxInfo.vue +++ b/src/main/resources/static/components/activityBx/ActivityBxInfo.vue @@ -1,558 +1,544 @@ diff --git a/src/main/resources/views/platform/jf/reimbursement/apply.html b/src/main/resources/views/platform/jf/reimbursement/apply.html index 43a96ff..9035cd9 100644 --- a/src/main/resources/views/platform/jf/reimbursement/apply.html +++ b/src/main/resources/views/platform/jf/reimbursement/apply.html @@ -38,12 +38,14 @@ layout("/layouts/platform.html"){ + + - - + - -
- 选择活动后自动填充活动基本信息，选择右侧小箭头可展开或折叠 -
+ + 查看活动详细信息 - - + - + - + - - - - - - - - - - - - - + - - - - - - - - {{ formData.activity_type == 40002 ? "分工会活动" : formData.activity_type == - 40003 ? "协会活动" - : "校工会活动"}} - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 活动内容 - - - - - - 附件 - - - - - - - - - - - - - - 活动费用预算及报销信息表 如有收款人请填写收款人、支行名称及报销卡号；如无收款人，请在备注栏中说明报销情况 @@ -337,8 +194,8 @@ layout("/layouts/platform.html"){ - 其他报销附件 - + + @@ -399,9 +256,8 @@ layout("/layouts/platform.html"){ --> - 签  字 - + + @@ -416,6 +272,12 @@ layout("/layouts/platform.html"){ + + + 导出活动报销凭证 diff --git a/src/main/resources/views/platform/jf/reimbursement/schoolChairman.html b/src/main/resources/views/platform/jf/reimbursement/schoolChairman.html index 65750de..4e79569 100644 --- a/src/main/resources/views/platform/jf/reimbursement/schoolChairman.html +++ b/src/main/resources/views/platform/jf/reimbursement/schoolChairman.html @@ -128,7 +128,7 @@ layout("/layouts/platform.html"){