diff --git a/pom.xml b/pom.xml index ecfefb32..91efa6fa 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,30 @@ UTF-8 + + + com.github.javen205 + IJPay-All + 2.9.10 + + + + com.alibaba + dashscope-sdk-java + 2.14.4 + + + org.slf4j + slf4j-simple + + + + + com.alipay.sdk + alipay-sdk-java + 4.35.37.ALL + + org.apache.axis axis diff --git a/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java b/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java index b97b0b75..c023259d 100644 --- a/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java +++ b/src/main/java/com/budwk/app/base/constant/BpmProcessConstant.java @@ -25,6 +25,7 @@ public enum BpmProcessConstant { GRASSROOTS_CONGRESS_MATERIALS("基层双代会会议资料"), MEMBER_SINGLE_APPLY("会员入会申请"), + MEMBER_CHANGE("会员入会申请"), MEMBER_BRANCH_UNION_CHANGE("会员分工会变更"), diff --git a/src/main/java/com/budwk/app/base/constant/RedisConstant.java b/src/main/java/com/budwk/app/base/constant/RedisConstant.java index e0d67dc7..959e6f7e 100644 --- a/src/main/java/com/budwk/app/base/constant/RedisConstant.java +++ b/src/main/java/com/budwk/app/base/constant/RedisConstant.java @@ -20,6 +20,9 @@ public class RedisConstant { //企业微信token public final static String REDIS_KEY_WX_WORK_TOKEN = PLATFORM_REDIS_PREFIX + "wxwork:token:"; + //健步走小程序TOKEN + public final static String REDIS_KEY_WE_APP_ACCESS_TOKEN = PLATFORM_REDIS_PREFIX + "weapp:token:"; + //图形验证码 public final static String REDIS_CAPTCHA_KEY = PLATFORM_REDIS_PREFIX + "platfrom:captcha:"; diff --git a/src/main/java/com/budwk/app/base/payment/alipay/controller/AlipayClientController.java b/src/main/java/com/budwk/app/base/payment/alipay/controller/AlipayClientController.java new file mode 100644 index 00000000..acae258d --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/alipay/controller/AlipayClientController.java @@ -0,0 +1,68 @@ +package com.budwk.app.base.payment.alipay.controller; + +import com.budwk.app.base.payment.alipay.service.AlipayService; +import lombok.extern.slf4j.Slf4j; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * @ClassName AlipayClientController + * @Description TODO + * @Author zhf + * @Date 2024/1/25 15:36 + */ +@IocBean +@Slf4j +@Ok("json:full") +@At("/mobile/memberCost/AlipayClient") +public class AlipayClientController { + + + @Inject + private AlipayService alipayService; + + + @At("/tradePagePay") + public String tradePagePay(String money, String paymentProjectId) throws Exception { + log.info("统一收单下单并支付接口调用"); + String formStr = alipayService.tradeCreate(money, paymentProjectId); + return formStr; + } + + @At("/tradeNotify") + @Ok("re") + public String tradeNotify(HttpServletRequest request) { + try { + Map params = new HashMap(); + Map requestParams = request.getParameterMap(); + for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext(); ) { + String name = (String) iter.next(); + String[] values = (String[]) requestParams.get(name); + String valueStr = ""; + for (int i = 0; i < values.length; i++) { + valueStr = (i == values.length - 1) ? valueStr + values[i] + : valueStr + values[i] + ","; + } + //乱码解决，这段代码在出现乱码时使用 + + valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8"); + + params.put(name, valueStr); + } + log.info("支付通知,正在执行,通知参数:{}"); + return alipayService.tradeNotify(params); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + + } + +} diff --git a/src/main/java/com/budwk/app/base/payment/alipay/service/AlipayClientConfig.java b/src/main/java/com/budwk/app/base/payment/alipay/service/AlipayClientConfig.java new file mode 100644 index 00000000..0508909e --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/alipay/service/AlipayClientConfig.java @@ -0,0 +1,22 @@ +package com.budwk.app.base.payment.alipay.service; + +/** + * @ClassName AlipayClientConfig + * @Description TODO + * @Author zhf + * @Date 2024/1/25 15:33 + */ +public interface AlipayClientConfig { + String serverUrl = "https://openapi.alipay.com/gateway.do"; + String appId = "2021004133670087"; + String sellerId = "2088002638762620"; + String privateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCEJBWNlUIY/2Tave1OtjTgvA21GZ5tdvZZD3jFmixIFTkEdZaRUpXCvlKuZ9heoL1IQwpbuOErJ4dM2f2Ju/Oc7QtUOjEOX6CnElR73KK5OSY8d8f5822LUOgp2zg5FHI6C7olYmjN4Nw26G6BGyqQBmWs4/sKzghKelEaH9AqkR8DZ+yOvuYtIg5KEvVixsM27TMhd6/3BuNXDIiQDVH9ZeQVb9IKuynZ6hnUJS0T4MkS41qehS1u8LgplGU5yvrNuUNeQtybADsiGHDNmNkl5lVt0QNh+N/lo56//duf5PJwh8ApDB22eXptiS6p321PSrYowy5VeFpHC07Tref9AgMBAAECggEAPQddXPKegGUT82LcgwnsCg9QVV/rp6rVw/Q9VyYJZZFHsCOO0rdNq4+zKBGWAL5ELWepFQuiEwhCmN/lFQPVU5i3LsNhfL31uLPiiQIxtVILssmvdmVTJpDLaOlyYgprZxubcUCuHsfHbSSURNSDJ9mMg/kXLLpTYfJ0Gpiuz7lkrMuAxncdz88Sp2r0O9k2T+TcnHFpRXHs+C/QAaa15EF18ieDSBLPkY0ti1R8J91LGAzDrjwcP7pNlq4u7TasZ7djv47ZFwQ3yjWoo13d9ab0MBYeQx9Grf5N+JGNf33YLyulQ0IshcuwNyB+RYhyWGjNmjnJdytzKRMOYSpPgQKBgQC6iqMPX+LGunyI+3T9l/AwAVWRJXzEHPflNxDYfQbicB5awlRixxH5T1qyZ46KZb/pBt01qDULXy0bEObVFSjAn1wXPzC9Fwb+BtVZUroYBTKV3tOAMpVCz2AAC34OZwG/3X//sRtW9Sr0Dr+yCcx8ULMiFS1BuCZfhSNXA516NQKBgQC1V+rge1pYKGnjtWqML4qJy4FEIDI4fSpGIizxumYDMxdXoUdNKoG2NHQkznHU4fIHJPVvIN/Tm82mfj2rhH9eFuu1FB8TL2soe5nPgzSJ9AmP7rZ7KBo3/SczvZqUEpii8+PjHu+Gx95BmgTzOFMnYz8xzitb4IBGTEGxVzavqQKBgCL28XFkS6FsOwOB/n+6Bu84kM1P9X7c3yo7lBC//pZa5ZWlbyPEpH3SffGKr5EJWVtYSgZQrQCgqle0Z0/xU14ngJ9q3LvUoR7kMQE5HGB8OOsWhRY2ZPvM2vWnMc2JSS6pWeCXVcSK164/RXcdlxKGHc15oq360lZ9Ig6hQtcxAoGAIYijd2V4HGtEwYXvsQKtlLOcMNPfVZDXu2Zgd0bnzFmrTFoXjE569A2ZGKFQbXRmxClydV1X5pKeIdagYtI6l1SXu8F/yZVwNGk+1R/HHGeTSRl0hyuwRYA7upaqOg2CSkfdcUdsNblKAUmQ9sUIo3T336bnX7MRJW6+iyO8ihkCgYBG8vG1fVUwPmqlRK+QanHxicR1+UyjRAN+aW6dgJUNMlC+tmPeHj21+WGkDdKPdhinHziLihLmzbmpwWSDwuGMMQPNQm8gSjiaqy1tWcP6XKDxjpG5biTzwEyHNuCIY6odS4HTeDOrrU4LvN6PxirN8xKBIpq+A2cgpGo+Mn4x+g=="; + String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjO/QUy+ujNBlToL6Kt8YjvTRGpEwmXjqc9pFe7GIORVkzBXP3F/UC/w5mPiwXhhyymXAe7bUwLANL/QMUZhvpjjCdLENtFWC9bd6hq3m2oHiTu0oicbzqCuaoQkzik2NybrNjuH+aYVi4RU0eNYpdewQoHHW+hbfxkSYUWmx7NF4SuG93edYlpc/G/ImdrweATLE0b6W9il4H/BxVUweCraPrispiOM8r6TN3fiIKUQRP15HKQo8Xsr4pMJzfi37I9aN8AThN/xBf6sual8IZZsH5hC3PS37LrYkXbUjt0dK5tqKl3SsZPjvvHGyz9b9JC225+0q09Y6B8/axOlihwIDAQAB"; + + /* String serverUrl = "https://openapi-sandbox.dl.alipaydev.com/gateway.do"; + String appId = "9021000134641646"; + String privateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCBFTF8qFbK+NiqUbKf1/jWHL/s0hfUXK6cyKwZCEXkEMZH1Lu6kZQl3kQye9Fsasawxn1vLmKz+OKjMiE+TdTytHDu5ULdLlSHN3bY1qf91i8L+RJfmZpb1p+NQOk9zImhhSauuk+itMkTC3bTiwwAkg/utOxkNB7YaynpAb3evhXnlX3LUVTHaMnCQFeV7ithh7CDKx0LPlxOpOvxnkWDBR3nsdcfjDqYNDVHXnUxEk0KQV4Ik6fA40+Gq/HXTByJolCSAaTk0OaH2ULp1RZAklWLqhiNEhytTZAlJUx8cSm36mm0c4jhgSXNdRz0Yi1BlPY9yxQGStpH5ue3+EfvAgMBAAECggEAda/D4Zp9HysIJyi7SZ6XwWaO2TSnAzfI/yq6NUxkpE1i6cSbr7rgrjHaTYiz5DvpkOw3GnHZDarhvtaKlopRl0JKIJSnhI6kBG/eDE6Q9Q4c8LaSONULdaXU6+z9ehmMddW28eDtkDNxi8qM+MuyEqcYnZMYXzdh1ADIQicTXArxo+9fpvlKUMNxOTO5LoOf0DtJg/xE1CD9PtWVc+l2G8S3+C52+RhfZ214YQdxwayMlvJQlWzLTbfzJCp8w4F2up1nJdwp7EY8k8xDUngEnG6BWm8ztWUVTTg7qp/+SC9yMTD2dl86wDkJt1lTtwcKaWxHYh2ZIn8a8+icHFykaQKBgQDgBEWAmuj0pgpny5Q0GRsUYPq42SwpN70u4rmD5UYFCeDHaKb4U3kyvA1V+1Tp0XWzFi7GU855h1n8dnQX64J3Vm4GfhftWwTJgB5ibbY53cZVEoV5nZe0bOO4hxxMdNy3BKjPovkT0REPpCkVas/RRLAFCdnvi6vmDkFxvv9JewKBgQCTgx9NZZCqSzzCJYpLTDOCitooOQmR8kAlgBiDCcHeH2wNVMh5O2Dl/OyTGauKUJFWIOSD8FXVTrNUbOEmx58msnS/+Mc5SnbEka5ptVEDp73gf6ctB+eZAMdO1kLsBT3iKnuyNa7pRyR/D2A692RHOTQZIvRHE1N+kM1r+iBPHQKBgCZRVLocxUAjrp/2eJE4wiMIO5qmuyEJwbhlW6ot634tJF+3jOfpD1AYToeoh+u+wk0xvCp8Z1LuTfwbHtyAkj5rcEJ4Cwu0h+sXmRro/USEpMokcuRMioh4H7OOmM6TJrW/fEiX7dbv6eUtBUH+lTGMeDdEahzJXUvqoFMegnhFAoGAa2eflRUMflIFzT7UMPsszjIXog3VoASJHETmlBK4q+ipHhPLXCoV5Z+BCaI5Op5rFBEjEcYeWQ/Slvgn/7p9cQmi5FxZgqdrTrjcC2/Pqx+pqxqHOMx2nvroI8jyNTOj2VchdaKM1qHMOw+Q+55Bz3IhMuQ2hMHXm2IHkEUw3SkCgYBjcqcWbJcq26L8yYVpU2JFzOvu7iHuV99TpEvF9Ym3cAcSNuoR5kGXzGS0MadYY87cd4HK9HvmXQmthLY14buKYxq27ZFfNbK/Auz8vk0Wbrm1Ym4Z1yMqClQqxKdr4hV29ijn1nPProRqgnVsGH3EtFmNxDfilZoVzh9ERaZe7w=="; + String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArhElUiFMpxqFCs+8zDHa4OVuhdWgKUUGVKgWnfLktPgy9mDZkuGPKk295k8ktWQSUZsnFvT8ikJIKdGYfbSWzlXvCAn6lDDDlsjfOJWMQ6zLmb9xygCih2OjwN5xt9QFIIthnWq8sOXpWvqmoRpIFQHolxxmvvCmUZ/VwK6mwgwU/yVvVypruQ/FGrJA70LAcJ764spWAMy/pWIoIs5UewOlJa3TAcZQIqRnjupL2/sI/TpIWFWF90a/rahwLfBgZ83VH7MA4Tl9uFLc3aeNFLllDF4X7lRdzaHIMYgUUKte9yvlDy5Ihrt+ssjsgdRhqLHvFn00u/g7BCvO5ZmIUwIDAQAB"; +*/ + +} diff --git a/src/main/java/com/budwk/app/base/payment/alipay/service/AlipayService.java b/src/main/java/com/budwk/app/base/payment/alipay/service/AlipayService.java new file mode 100644 index 00000000..fa4486b0 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/alipay/service/AlipayService.java @@ -0,0 +1,15 @@ +package com.budwk.app.base.payment.alipay.service; + + +import com.budwk.app.base.service.BaseService; + +import java.util.Map; + +public interface AlipayService extends BaseService { + /** + * 支付宝开放平台接收 request请求对象后 + * @return + */ + String tradeCreate( String money, String paymentProjectId) throws Exception; + String tradeNotify(Map params) ; +} diff --git a/src/main/java/com/budwk/app/base/payment/alipay/service/impl/AlipayNewServiceImpl.java b/src/main/java/com/budwk/app/base/payment/alipay/service/impl/AlipayNewServiceImpl.java new file mode 100644 index 00000000..553ac948 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/alipay/service/impl/AlipayNewServiceImpl.java @@ -0,0 +1,140 @@ +package com.budwk.app.base.payment.alipay.service.impl; + +import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayConstants; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.domain.AlipayTradeWapPayModel; +import com.alipay.api.internal.util.AlipaySignature; +import com.alipay.api.request.AlipayTradeWapPayRequest; +import com.alipay.api.response.AlipayTradeWapPayResponse; +import com.budwk.app.base.payment.alipay.service.AlipayClientConfig; +import com.budwk.app.base.payment.alipay.service.AlipayService; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +import java.util.Date; +import java.util.Map; + +/** + * @ClassName AlipayNewServiceImpl + * @Description TODO + * @Author zhf + * @Date 2024/1/25 15:38 + */ + +@Slf4j +@IocBean(args = {"refer:dao"}) +public class AlipayNewServiceImpl extends BaseServiceImpl implements AlipayService { + public AlipayNewServiceImpl(Dao dao) { + super(dao); + } + + DefaultAlipayClient alipayClient = new DefaultAlipayClient(AlipayClientConfig.serverUrl, + AlipayClientConfig.appId, + AlipayClientConfig.privateKey, + AlipayConstants.FORMAT_JSON, + AlipayConstants.CHARSET_UTF8, + AlipayClientConfig.alipayPublicKey, + AlipayConstants.SIGN_TYPE_RSA2); + + @Override + public String tradeCreate(String money, String paymentProjectId) throws Exception { + String outTradeNo = String.valueOf(new Date().getTime()); + AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest(); + //支付宝公共参数 + request.setReturnUrl("http://sansi.ltd/mobile/memberCost/AlipayClient/tradeNotify"); + + + //面向对象封装业务参数 + AlipayTradeWapPayModel model = new AlipayTradeWapPayModel(); + model.setOutTradeNo(outTradeNo); + model.setTotalAmount(money); + model.setSubject("会员入会会费"); + model.setProductCode("QUICK_WAP_WAY"); + model.setSellerId(AlipayClientConfig.sellerId); + model.setTimeoutExpress("30m"); + model.setQuitUrl("http://sansi.ltd/mobile/memberCost/list"); + + request.setBizModel(model); + + //执行请求,调用支付宝 + AlipayTradeWapPayResponse response = alipayClient.pageExecute(request, "POST"); + if (response.isSuccess()) { + dao().update(MemberPaymentInfo.class, Chain.make("payId", outTradeNo), Cnd.where("paymentProjectId", "=", paymentProjectId) + .and("userId", "=", SecurityUtil.getUserId())); + log.info("调用成功,返回结果:[{}]", response.getBody()); + return response.getBody(); + } else { + log.info("调用失败!!"); + } + return null; + } + + @Override + public String tradeNotify(Map params) { + String total_amount = params.get("total_amount"); + String out_trade_no = params.get("out_trade_no"); + String trade_no = params.get("trade_no"); + +// + String result = "failure"; + try { + //异步通知验签 + boolean signVerified = AlipaySignature.rsaCheckV1(params, + AlipayClientConfig.alipayPublicKey, + AlipayConstants.CHARSET_UTF8, + AlipayConstants.SIGN_TYPE_RSA2); + if (!signVerified) { + // TODO 验签失败则记录异常日志，并在response中返回failure. + log.error("支付成功,异步通知验签失败!"); + return result; + } + log.info("支付成功,异步通知验签成功!"); + //TODO 验签成功后，按照支付结果异步通知中的描述，对支付结果中的业务内容进行二次校验 + //1.验证out_trade_no 是否为商家系统中创建的订单号 + String outTradeNo = params.get("out_trade_no"); + if (!outTradeNo.equals(out_trade_no)) { + log.error("订单号不一致"); + return result; + } + //2.判断 total_amount 是否确实为该订单的实际金额 + String totalAmount = params.get("total_amount"); + if (!totalAmount.equals(total_amount)) { + log.error("订单的实际金额不一致"); + return result; + } + //3.校验通知中的 seller_id是否为 out_trade_no 这笔单据的对应的操作方 + String sellerId = params.get("seller_id"); + if (!sellerId.equals(AlipayClientConfig.sellerId)) { + log.error("商家PID校验失败"); + return result; + } + //4.验证 app_id 是否为该商家本身 + String appId = params.get("app_id"); + if (!appId.equals(AlipayClientConfig.appId)) { + log.error("app_id校验失败"); + return result; + } + + dao().update(MemberPaymentInfo.class, + Chain.make("isPayment", true) + .add("paymentMoney", total_amount) + .add("paymentTime", new Date()) + .add("tradeNo", trade_no), + Cnd.where("userId", "=", SecurityUtil.getUserId()).and("payId", "=", out_trade_no)); + + //TODO 处理自身业务 + result = "->:/mobile/memberCost/list/paySuccess"; + } catch (AlipayApiException e) { + e.printStackTrace(); + } + + return result; + } +} diff --git a/src/main/java/com/budwk/app/base/payment/enums/RefundStateEnum.java b/src/main/java/com/budwk/app/base/payment/enums/RefundStateEnum.java new file mode 100644 index 00000000..39b33ca3 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/enums/RefundStateEnum.java @@ -0,0 +1,24 @@ +package com.budwk.app.base.payment.enums; + +import com.budwk.app.base.annotation.DictEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 退款状态枚举 + */ +@Getter +@AllArgsConstructor +@DictEnum(key = "RefundStateEnum", name = "退款状态枚举") +public enum RefundStateEnum { + + INITIATE_REFUND("发起退款"), + REFUNDING("退款中"), + REFUND_SUCCESS("退款成功"), + REFUND_FAILED("退款失败"); + + /** + * 避免和枚举类的name冲突 + */ + public final String refundStateName; +} diff --git a/src/main/java/com/budwk/app/base/payment/enums/TradingChannelEnum.java b/src/main/java/com/budwk/app/base/payment/enums/TradingChannelEnum.java new file mode 100644 index 00000000..c8e0fd3f --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/enums/TradingChannelEnum.java @@ -0,0 +1,25 @@ +package com.budwk.app.base.payment.enums; + +import com.budwk.app.base.annotation.DictEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 交易渠道枚举 + */ +@Getter +@AllArgsConstructor +@DictEnum(key = "TradingChannelEnum", name = "交易渠道枚举") +public enum TradingChannelEnum { + + QQ_PAY("QQ"), + WX_PAY("微信"), + JD_PAY("京东"), + ALI_PAY("支付宝"), + UNION_PAY("云闪付"); + + /** + * 避免和枚举类的name冲突 + */ + public final String tradingChannelName; +} diff --git a/src/main/java/com/budwk/app/base/payment/enums/TradingStateEnum.java b/src/main/java/com/budwk/app/base/payment/enums/TradingStateEnum.java new file mode 100644 index 00000000..8e2c3a63 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/enums/TradingStateEnum.java @@ -0,0 +1,24 @@ +package com.budwk.app.base.payment.enums; + +import com.budwk.app.base.annotation.DictEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + + +/** + * 支付状态枚举 + */ +@Getter +@AllArgsConstructor +@DictEnum(key = "TradingStateEnum", name = "支付状态枚举") +public enum TradingStateEnum { + + WAITING_FOR_PAYMENT("等待支付"), + PAY_SUCCESS("支付成功"), + CANCEL_PAYMENT("取消支付"); + + /** + * 避免和枚举类的name冲突 + */ + public final String tradingStateName; +} diff --git a/src/main/java/com/budwk/app/base/payment/enums/TradingTypeEnum.java b/src/main/java/com/budwk/app/base/payment/enums/TradingTypeEnum.java new file mode 100644 index 00000000..b4ba9379 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/enums/TradingTypeEnum.java @@ -0,0 +1,22 @@ +package com.budwk.app.base.payment.enums; + +import com.budwk.app.base.annotation.DictEnum; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 交易类型枚举 + */ +@Getter +@AllArgsConstructor +@DictEnum(key = "TradingTypeEnum", name = "交易类型枚举") +public enum TradingTypeEnum { + + PAYMENT("付款"), + REFUND("退款"); + + /** + * 避免和枚举类的name冲突 + */ + public final String tradingTypeName; +} diff --git a/src/main/java/com/budwk/app/base/payment/enums/WxPayResultCode.java b/src/main/java/com/budwk/app/base/payment/enums/WxPayResultCode.java new file mode 100644 index 00000000..d8912181 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/enums/WxPayResultCode.java @@ -0,0 +1,30 @@ +package com.budwk.app.base.payment.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @version 1.0 + * @Author zzr + * @name：WxPayResultCode + * @Date 2025/3/10 10:27 + * @注释 微信支付返回码 + */ +@Getter +@AllArgsConstructor +public enum WxPayResultCode { + + SUCCESS(200, "操作成功"), + APPID_MCHID_NOT_MATCH(400, "商户ID和服务号或企业微信号不匹配"), + INVALID_REQUEST(400, "无效请求"), + MCH_NOT_EXISTS(400, "商户号不存在"), + PARAM_ERROR(400, "参数错误"), + SIGN_ERROR(401, "签名错误"), + NO_AUTH(403, "商户无权限"), + OUT_TRADE_NO_USED(403, "商户订单号重复"), + FREQUENCY_LIMITED(429, "频率超限"), + SYSTEM_ERROR(500, "系统错误"); + + final int code; + final String msg; +} diff --git a/src/main/java/com/budwk/app/base/payment/model/PaymentRefundRecord.java b/src/main/java/com/budwk/app/base/payment/model/PaymentRefundRecord.java new file mode 100644 index 00000000..76bb109a --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/model/PaymentRefundRecord.java @@ -0,0 +1,61 @@ +package com.budwk.app.base.payment.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.math.BigDecimal; + +/** + * 退款记录表 + */ +@Data +@Table +@Comment("退款记录表") +@EqualsAndHashCode(callSuper = true) +public class PaymentRefundRecord extends BaseModel { + + @Column + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("关联系统交易订单表Id") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String paymentTransactionId; + + @Column + @Comment("本次退款订单号") + @ColDefine(type = ColType.VARCHAR,width = 128) + private String outRefundTradeNo; + + @Column + @Comment("第三方支付的退款单号") + @ColDefine(type = ColType.VARCHAR,width = 128) + private String refundNo; + + @Column + @Comment("退款状态") + @ColDefine(type = ColType.VARCHAR,width = 30) + private String refundState; + + @Column + @Comment("本次退款金额") + @ColDefine(type = ColType.INT) + private Integer refundAmount; + + @Column + @Comment("原订单金额") + @ColDefine(type = ColType.INT) + private Integer total; + + @Column + @Comment("交易返回数据") + @ColDefine(type = ColType.MYSQL_JSON) + private String resultJson; +} diff --git a/src/main/java/com/budwk/app/base/payment/model/PaymentTransaction.java b/src/main/java/com/budwk/app/base/payment/model/PaymentTransaction.java new file mode 100644 index 00000000..b1961339 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/model/PaymentTransaction.java @@ -0,0 +1,131 @@ +package com.budwk.app.base.payment.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.math.BigDecimal; + +/** + * 交易单表 + */ +@Data +@Table +@Comment("交易订单表") +@EqualsAndHashCode(callSuper = true) +public class PaymentTransaction extends BaseModel { + + @Column + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("商户号") + @ColDefine(type = ColType.VARCHAR,width = 128) + private String mchId; + + @Column + @Comment("订单号，传递给交易系统，交易系统订单号") + @ColDefine(type = ColType.VARCHAR,width = 128) + private String outTradeNo; + + @Column + @Comment("交易系统交易号") + @ColDefine(type = ColType.VARCHAR,width = 128) + private String transactionId; + + @Column + @Comment("交易渠道") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String tradingChannel; + + @Column + @Comment("交易类型") + @ColDefine(type = ColType.VARCHAR,width = 30) + private String tradingType; + + @Column + @Comment("交易状态") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String tradingState; + + @Column + @Comment("用户ID") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String userId; + + @Column + @Comment("用户工号") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String loginName; + + @Column + @Comment("用户姓名") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String userName; + + @Column + @Comment("工会id") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String unionId; + + @Column + @Comment("用户工会") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String unionName; + + @Column + @Comment("单位id") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String unitId; + + @Column + @Comment("用户单位") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String unitName; + + @Column + @Comment("交易金额") + @ColDefine(type = ColType.INT) + private Integer tradingAmount; + + @Column + @Comment("是否退款") + @ColDefine(type = ColType.BOOLEAN) + private Boolean isRefund; + + @Column + @Comment("退款金额") + @ColDefine(type = ColType.INT) + private Integer refundAmount; + + @Column + @Comment("订单描述") + @ColDefine(type = ColType.VARCHAR,width = 128) + private String description; + + @Column + @Comment("附加详细描述") + @ColDefine(type = ColType.TEXT) + private String attach; + + @Column + @Comment("微信支付用户openId") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String openId; + + @Column + @Comment("交易返回数据") + @ColDefine(type = ColType.MYSQL_JSON) + private String resultJson; + + @Column + @Comment("交易名单的主键id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String memberPaymentInfoId; +} diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/bean/WxPayV3Bean.java b/src/main/java/com/budwk/app/base/payment/wxpay/bean/WxPayV3Bean.java new file mode 100644 index 00000000..c3ef48be --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/bean/WxPayV3Bean.java @@ -0,0 +1,53 @@ +package com.budwk.app.base.payment.wxpay.bean; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @version 1.0 + * @Author zzr + * @name：WxPayV3Bean + * @Date 2025/3/6 9:54 + * @注释 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class WxPayV3Bean { + + /** + * 服务号 + * appid: wxf12fa6175ec7c75f + * app_secret: f65bbb41d3de4a93c8c93d8e2fd50369 + */ + + private String appId; + private String keyPath; + private String publicKeyPath; + private String certPath; + private String certP12Path; + private String platformCertPath; + private String mchId; + private String apiKey; + private String apiKey3; + private String domain; + private String publicKeyId; + + @Override + public String toString() { + return "WxPayV3Bean{" + + "appId='" + appId + '\'' + + ", keyPath='" + keyPath + '\'' + + ", publicKeyPath='" + publicKeyPath + '\'' + + ", certPath='" + certPath + '\'' + + ", certP12Path='" + certP12Path + '\'' + + ", platformCertPath='" + platformCertPath + '\'' + + ", mchId='" + mchId + '\'' + + ", apiKey='" + apiKey + '\'' + + ", apiKey3='" + apiKey3 + '\'' + + ", domain='" + domain + '\'' + + ", publicKeyId='" + publicKeyId + '\'' + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/controller/WxPayCommonController.java b/src/main/java/com/budwk/app/base/payment/wxpay/controller/WxPayCommonController.java new file mode 100644 index 00000000..598272ec --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/controller/WxPayCommonController.java @@ -0,0 +1,44 @@ +package com.budwk.app.base.payment.wxpay.controller; + +import com.budwk.app.base.payment.wxpay.service.WxPayCommonService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @version 1.0 + * @Author zzr + * @name：WxPayCommonController + * @Date 2025/3/10 19:28 + * @注释 微信支付回调 + */ +@Slf4j +@IocBean +@Ok("json:full") +@At("/platform/wxPay") +public class WxPayCommonController { + + @Inject + private WxPayCommonService wxPayCommonService; + + + @At + @Ok("void") + @ApiOperation("微信支付-付款回调") + public void payNotify(HttpServletRequest request, HttpServletResponse response){ + wxPayCommonService.payNotify(request, response); + } + + + @At + @Ok("void") + public void refundNotify(HttpServletRequest request, HttpServletResponse response){ + wxPayCommonService.refundNotify(request, response); + } +} diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_cert.pem b/src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_cert.pem new file mode 100644 index 00000000..ee557fe9 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_cert.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEKDCCAxCgAwIBAgIUONYpzvxVfV/RrWnLGPlL6/nb/AcwDQYJKoZIhvcNAQEL +BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT +FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg +Q0EwHhcNMjUwMzA2MTQwNDAzWhcNMzAwMzA1MTQwNDAzWjCBgTETMBEGA1UEAwwK +MTY2NjkzMDk4MDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL +DCTmrabmsYnlnLDlpKfkuInmgJ3np5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT +AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALlDML+FJEW+m2hXp/qUH1cU6xlwFllLU4LjFusJkxwyzzcZO4nY0mOi +3woz8xIJipvUWj2Y413WYwMkfcJcRgghupZkfYwdQtSyPfUu7xQBUm8TLWGH88Re +kyyVABEB5T+ne6r3LesXS4IuZknm5N/iaa4z9mbbscGqF0GLvMUqZCRNyTkyfK9r +Bkvs/vspi+Jcjx9I7aU++h/vwzsGB6Bf/uB3kLMb+lj/i3xY20sdrrW8JD2sqONQ +NcRIKmNXSp4zsNy+d6kIKWE3P5609ZTta1ogkeGBNdGXMRNNy6vLIudQc7zny/9H +S4LxGsIrsYmZNhGljRng56X+PG3w1CUCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG +A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu +aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC +MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB +OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQBQ5e8U +1pQ40gfRoZyO0s+QF16L8pAcVLVwHffo0mmJpIRB4bu8W5IJ9kKhksJ0CzZ0YEwB +Yv7/LTC1qpi7PE73nZ4Ytm9oZeH1Kk5KIlQS+2H3IwOpoV4wucMc34y6MVQJjC7E +u5OnglBPSAopwNP4p+Us9A3ah7Ks48XCw+LCEWpA/setJwo9C13Qq2AQm8qLpogK +pNBwm/oylxb8/kZK1lLPgcXd7geLDhl/Str+aOzBXyd7YSEMxS8zWiZhWozu6rCq +dg10QFKicPGDkDzNQwBz7cDXvlJXSWRDBK5r1li1YgX+QD5WJYPchATo5SlvF4Lr +5/V/dZzI7BJTinr1 +-----END CERTIFICATE----- diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_key.pem b/src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_key.pem new file mode 100644 index 00000000..36b4b679 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5QzC/hSRFvpto +V6f6lB9XFOsZcBZZS1OC4xbrCZMcMs83GTuJ2NJjot8KM/MSCYqb1Fo9mONd1mMD +JH3CXEYIIbqWZH2MHULUsj31Lu8UAVJvEy1hh/PEXpMslQARAeU/p3uq9y3rF0uC +LmZJ5uTf4mmuM/Zm27HBqhdBi7zFKmQkTck5MnyvawZL7P77KYviXI8fSO2lPvof +78M7BgegX/7gd5CzG/pY/4t8WNtLHa61vCQ9rKjjUDXESCpjV0qeM7DcvnepCClh +Nz+etPWU7WtaIJHhgTXRlzETTcuryyLnUHO858v/R0uC8RrCK7GJmTYRpY0Z4Oel +/jxt8NQlAgMBAAECggEBAKGQqTi9Ii741Ysftsze1J4bDhS3HaZt/LyO0vPS+8qB +vRiuFrBWuNRPu/en6nl2fLz9al2Bsfep+dtJvar80c5Rq+lwZdUFx7y6XTIv5iwq +IvvfW5pM+Bfu6qbcopwybP0gUMd+nTsCq8UyNd6JUFy3lbZodqCpQ9JDRdjRxqSi +oMonve36Q9kJyDs0mS2F0w+Y9oYFtpE9WvGMBthwT7VfzWuDa+YC/Gh0RhT2V9OG +uDC8kxmfaIbk0IITDVFWVMMhScXiqmJL1II9yQWsCHH73dZS+dDxwwH0ObRD3kOx +hHptxpRzhtuNxLjCOZDGhneyvUHIftpqf4wdOgQ8iUECgYEA6TDo36s3XDFIs8SH +lpVYrhie0nmaNET50CtOc5C2M1OotrkMUrQTMoa4F263UloJfqweW9AKZX11wPp2 +8h7af2sZsGawjuwv7mMthZJoi0fc5J2+z6BnVGgFo7uZbcs1Y/+B0tNrDKIHVrqb +Lywmh18iKDXrMiMDMRp8mtiNyU0CgYEAy2Im0oGb1rmAh9gPvQIENmNEgRsyIU4x +WPAFb5KO7jnseO9KrC9uiRSO5JuwZu/QNGlga2w77Gu7n+Q4HfSU2KFlNhR6pKjb +mqXzPq1quryzbtWay520VsRKz3F/Tfp1FUpIuZvj8x7FrL8z8vjbLkbW4p+Z7HE4 +heYdmk2KCjkCgYBC6xU48pJtc3swk2pxjSQoucoCDoFxFIY39eWKhnGy4wQcg5gE +t8Z2jnCP0ObszAfDgTMpF9eT7l/3ZCj0LGR5gkuZ8q4iJadPmsh6d1xm89VxCc+z +F43vi/ZqWTCbcGA+9RjVXnRu6KSAgAZ+kAXyfRt5PJflCGUnFznA2fo+VQKBgG6s +n7Gno/UKBv5lPdM9mKs8A5g6A2KKWWIrYtnfJ/ZNAPiiRsFCImVoEYYnjqvFTkhn +G3f5cvZpfbU5jKwIX0MvOJNgO4kE9lPGgIKX/d9WNlJW3KB21h7tPER8X6lAZJxM +SxztzvKKyUkC1zMd5q/dDqxN64X16qs6mNtR3I9JAoGBAJbqQtg59Szi2m4jZ9Xo +0cKvP7+PSKgysdWsemTkU0ji1rcMpGRTtcUGRWlawLjRSInQS+xNdL6GVU5mHZWe +gNwXIXEpape4IJta0B1PYAhNcIvOSh5CzcUnVTeo6q0CTSVQPdsivlrObLKZ4uGQ +eewDw82Ej6YoSgczjf99ug0x +-----END PRIVATE KEY----- diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/pem/wechatpay.pem b/src/main/java/com/budwk/app/base/payment/wxpay/pem/wechatpay.pem new file mode 100644 index 00000000..aaa69381 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/pem/wechatpay.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEFDCCAvygAwIBAgIUKN05Gm0Q9n9mLPPltUh8qjKKegQwDQYJKoZIhvcNAQEL +BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT +FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg +Q0EwHhcNMjUwMzA2MTQwNDAzWhcNMzAwMzA1MTQwNDAzWjBuMRgwFgYDVQQDDA9U +ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl +bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGEwJDTjERMA8GA1UEBwwIU2hlblpo +ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbMenF0GNlcUYErPpj +Aj+WOuzRFz+PJcrtgkI81S0WDh8flMtq1A2nwKARNyPXx+UPd9it657nH5G8E9kL +Ea5u5rENpn+JZc4cAIvZqazteSAUg2pfQH9ewW+/CxNOWarjXPNRYa0OjZWf+5F8 +ZBOT/x8sJ2+jou9lxKNe1skha+jzmiQ8m3B2vPXqR87qgL/fyQjjpLvBGpvearh/ +hxTMBEfGeB4F6Fu52Fz3/VCWe38ubxwj8EMcRSPp4xsl2BTaRVMMT525Hul2N49C +vXCSVsCNt3ND8UDffXnb19Zgpir4KqpECTbfqcT7YX+U34P1Av8gcDl6rRm+7Wpj +PY4RAgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB +kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv +aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4 +RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0 +MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAUAvXCx55ZGmd3ATi28W4mirnUHQb2RAw +X5/0OC2SkuBdzxI5RbY4YAuugP6nQIAU8TXCANzno2oqZ6vmFZ4dBnJmLewVFMoM +qp18A4RWmnsGnmEIgMm6N1kB+RbM11oLCLdy2KK0SvmqDmTBFJyjyUGqEmRshnV/ +QfKn4UUzJ4suDFAolGX4DyDIOtM0D+SCHwwxGI4yf2+nj4IB8XgmmOeschxoSvu9 +T3E6BgQ271YVDwg+3r9CiFVI5JdyftvQagOEQmZJMPINEKgFn5LzrZJW7mH42+N+ +i4RFz04wpGUsrSFDESh3JxYSNhq/HulpMLinntWxEBHFhpkjyyGDGg== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/service/WxPayCommonService.java b/src/main/java/com/budwk/app/base/payment/wxpay/service/WxPayCommonService.java new file mode 100644 index 00000000..0333726b --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/service/WxPayCommonService.java @@ -0,0 +1,71 @@ +package com.budwk.app.base.payment.wxpay.service; + + +import com.budwk.app.base.payment.wxpay.vo.WxPayNeedParamVo; +import com.budwk.app.base.result.Result; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @version 1.0 + * @Author zzr + * @name：WxPayCommonService + * @Date 2025/3/6 11:40 + * @注释 + */ +public interface WxPayCommonService { + + + /** + * 二维码统一下单，返回支付二维码链接 + * @param paramVo 需要传递的信息，请自定义付款金额Amount 和 付款描述Description，其他关键信息请勿修改 + * 注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元 + * @return + */ + Result nativePay(WxPayNeedParamVo paramVo); + + + /** + * JSAPI支付，返回支付参数 + * @param paramVo 需要传递的信息，请自定义付款金额Amount 和 付款描述Description，其他关键信息请勿修改 + * 注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元 + * JsAPI支付，需要传递openId，请自行获取 + * @return + */ + Result jsApiPay(WxPayNeedParamVo paramVo); + + /** + * WAP支付，返回支付参数 + * @param paramVo 需要传递的信息，请自定义付款金额Amount 和 付款描述Description，其他关键信息请勿修改 + * 注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元 + * @return + */ + Result wapPay(WxPayNeedParamVo paramVo); + + + /** + * 支付回调,验证是否支付成功 + * @param request 请求 + * @param response 响应 + */ + void payNotify(HttpServletRequest request, HttpServletResponse response); + + + /** + * 退款 + * @param transactionId 微信订单号 + * @param outTradeNo 商户订单号 + * @return + */ + Result refund(String transactionId, String outTradeNo); + + + /** + * 退款回调 + * @param request 请求 + * @param response 响应 + */ + void refundNotify(HttpServletRequest request, HttpServletResponse response); + +} diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/com/budwk/app/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java new file mode 100644 index 00000000..0b3cd689 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java @@ -0,0 +1,612 @@ +package com.budwk.app.base.payment.wxpay.service.impl; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.ContentType; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.payment.enums.*; +import com.budwk.app.base.payment.model.PaymentRefundRecord; +import com.budwk.app.base.payment.model.PaymentTransaction; +import com.budwk.app.base.payment.wxpay.bean.WxPayV3Bean; +import com.budwk.app.base.payment.wxpay.service.WxPayCommonService; +import com.budwk.app.base.payment.wxpay.vo.WxPayNeedParamVo; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.sys.services.SysUserService; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.ijpay.core.IJPayHttpResponse; +import com.ijpay.core.enums.AuthTypeEnum; +import com.ijpay.core.enums.RequestMethodEnum; +import com.ijpay.core.kit.AesUtil; +import com.ijpay.core.kit.HttpKit; +import com.ijpay.core.kit.PayKit; +import com.ijpay.core.kit.WxPayKit; +import com.ijpay.wxpay.WxPayApi; +import com.ijpay.wxpay.enums.WxDomainEnum; +import com.ijpay.wxpay.enums.v3.BasePayApiEnum; +import com.ijpay.wxpay.model.v3.*; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.random.R; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.FileWriter; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.nio.charset.StandardCharsets; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @Author zzr + * @name：WxPayCommonServiceImpl + * @Date 2025/3/6 11:41 + * @注释 + */ +@Slf4j +@IocBean +public class WxPayCommonServiceImpl implements WxPayCommonService { + + // 判断下单接口成功返回码 + private final static int OK = 200; + + // 1666930980 商户号 + // ww3eda050a1b5ad96e 企业微信 + // wxf12fa6175ec7c75f 微信服务号 + // 微信V3必要的支付参数，后期优化 + private final static WxPayV3Bean WX_PAY_V3_BEAN = new WxPayV3Bean( + "wxf12fa6175ec7c75f", + "src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_key.pem", + "src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_key.pem", + "src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_cert.pem", + "src/main/java/com/budwk/app/base/payment/wxpay/pem/apiclient_cert.pem", + "src/main/java/com/budwk/app/base/payment/wxpay/pem/wechatpay.pem", + "1666930980", + "", + "4ebd020883285d698c44ec50939c0967", + "https://schoolhd.top/platform", + ""); + + // 自定义参数，内容是统一的，但会被多次调用，直接声明 + private String serialNo; + private String platSerialNo; + private final String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/payNotify"); + private final String refundNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/refundNotify"); + + @Inject + private Dao dao; + @Inject + private SysUserService sysUserService; + + /** + * 微信扫描二维码支付 + * @param paramVo 需要传递的信息，请自定义付款金额Amount 和 付款描述Description，其他关键信息请勿修改 + * 注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元 + * @return + */ + @Override + @Aop(TransAop.READ_COMMITTED) + public Result nativePay(WxPayNeedParamVo paramVo) { + try { + // 商户订单号，存储当前用户的订单 + String outTradeNo = PayKit.generateStr(); + + String timeExpire = getNowTimeExpire(); + UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel() + .setAppid(WX_PAY_V3_BEAN.getAppId()) + .setMchid(WX_PAY_V3_BEAN.getMchId()) + // 描述信息 + .setDescription(paramVo.getDescription()) + .setOut_trade_no(outTradeNo) + .setTime_expire(timeExpire) + .setAttach(paramVo.getAttach()) + .setNotify_url(payNotifyUrl) + // 订单金额 + .setAmount(paramVo.getAmount()); + + log.info("二维码支付统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel)); + IJPayHttpResponse response = WxPayApi.v3( + RequestMethodEnum.POST, + WxDomainEnum.CHINA.toString(), + BasePayApiEnum.NATIVE_PAY.toString(), + WX_PAY_V3_BEAN.getMchId(), + getSerialNumber(), + null, + WX_PAY_V3_BEAN.getKeyPath(), + JSONUtil.toJsonStr(unifiedOrderModel), + AuthTypeEnum.RSA.getCode() + ); + log.info("统一下单响应 {}", response); + // 根据证书序列号查询对应的证书来验证签名结果 + boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath()); + log.info("verifySignature: {}", verifySignature); + // 下单返回数据 + String result = response.getBody(); + + JSONObject jsonObject = JSONUtil.parseObj(result); + + if (response.getStatus() == OK) { + // 统一下单成功，向数据库插入订单记录 + insertTradingOrder(paramVo, outTradeNo, result); + return Result.success("请在三分钟内完成支付，超时将自动取消订单").addData(result); + } else { + WxPayResultCode code = WxPayResultCode.valueOf(WxPayResultCode.class, jsonObject.getStr("code")); + return Result.error(code.getMsg()); + } + } catch (Exception e) { + log.error("系统异常", e); + return Result.error(e.getMessage()); + } + } + + + @Override + @Aop(TransAop.READ_COMMITTED) + public Result jsApiPay(WxPayNeedParamVo paramVo) { + try { + Sys_user user = dao.fetch(Sys_user.class, SecurityUtil.getUserId()); + if (StrUtil.isBlank(user.getOpenId())) { + return Result.error("未获取到当前用户的openid，请重新登录"); + } + // 商户订单号，存储当前用户的订单 + String outTradeNo = PayKit.generateStr(); + // 订单关闭时间 + String timeExpire = getNowTimeExpire(); + UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel() + .setAppid(WX_PAY_V3_BEAN.getAppId()) + .setMchid(WX_PAY_V3_BEAN.getMchId()) + .setDescription(paramVo.getDescription()) + .setOut_trade_no(outTradeNo) + .setTime_expire(timeExpire) + .setAttach(paramVo.getAttach()) + .setNotify_url(payNotifyUrl) + .setAmount(paramVo.getAmount()) + .setPayer(new Payer().setOpenid(user.getOpenId())); + + log.info("统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel)); + IJPayHttpResponse response = WxPayApi.v3( + RequestMethodEnum.POST, + WxDomainEnum.CHINA.toString(), + BasePayApiEnum.JS_API_PAY.toString(), + WX_PAY_V3_BEAN.getMchId(), + getSerialNumber(), + null, + WX_PAY_V3_BEAN.getKeyPath(), + JSONUtil.toJsonStr(unifiedOrderModel) + ); + log.info("统一下单响应 {}", response); + // 根据证书序列号查询对应的证书来验证签名结果 + boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath()); + log.info("verifySignature: {}", verifySignature); + if (response.getStatus() == OK && verifySignature) { + String body = response.getBody(); + JSONObject jsonObject = JSONUtil.parseObj(body); + String prepayId = jsonObject.getStr("prepay_id"); + Map map = WxPayKit.jsApiCreateSign(WX_PAY_V3_BEAN.getAppId(), prepayId, WX_PAY_V3_BEAN.getKeyPath()); + log.info("唤起支付参数:{}", map); + // 唤起支付成功，向数据库插入订单参数 + insertTradingOrder(paramVo, outTradeNo, body); + return Result.success().addData(JSONUtil.toJsonStr(map)); + } +// return JSONUtil.toJsonStr(response); + return Result.error("唤起支付失败"); + } catch (Exception e) { + log.error("系统异常", e); + return Result.error(e.getMessage()); + } + } + + + @Override + @Aop(TransAop.READ_COMMITTED) + public Result wapPay(WxPayNeedParamVo paramVo) { + try { + // 商户订单号，存储当前用户的订单 + String outTradeNo = PayKit.generateStr(); + // 订单关闭时间 + String timeExpire = getNowTimeExpire(); + UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel() + .setAppid(WX_PAY_V3_BEAN.getAppId()) + .setMchid(WX_PAY_V3_BEAN.getMchId()) + .setDescription(paramVo.getDescription()) + .setOut_trade_no(outTradeNo) + .setTime_expire(timeExpire) + .setAttach(paramVo.getAttach()) + .setNotify_url(payNotifyUrl) + .setAmount(paramVo.getAmount()) + .setScene_info( + new SceneInfo() + .setPayer_client_ip(""). + setH5_info(new H5Info() + .setType("Wap"))); + + log.info("统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel)); + IJPayHttpResponse response = WxPayApi.v3( + RequestMethodEnum.POST, + WxDomainEnum.CHINA.toString(), + BasePayApiEnum.H5_PAY.toString(), + WX_PAY_V3_BEAN.getMchId(), + getSerialNumber(), + null, + WX_PAY_V3_BEAN.getKeyPath(), + JSONUtil.toJsonStr(unifiedOrderModel) + ); + log.info("统一下单响应 {}", response); + // 根据证书序列号查询对应的证书来验证签名结果 + boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath()); + log.info("verifySignature: {}", verifySignature); + if (response.getStatus() == OK && verifySignature) { + String body = response.getBody(); + insertTradingOrder(paramVo, outTradeNo, body); + return Result.success(JSONUtil.toJsonStr(body)); + } +// return JSONUtil.toJsonStr(response); + return Result.error(); + } catch (Exception e) { + log.error("系统异常", e); + return Result.error(e.getMessage()); + } + } + + + /** + * 支付回调 + * @param request + * @param response + */ + @Override + public void payNotify(HttpServletRequest request, HttpServletResponse response) { + Map map = new HashMap<>(12); + try { + String timestamp = request.getHeader("Wechatpay-Timestamp"); + String nonce = request.getHeader("Wechatpay-Nonce"); + String serialNo = request.getHeader("Wechatpay-Serial"); + String signature = request.getHeader("Wechatpay-Signature"); + + log.info("timestamp:{} nonce:{} serialNo:{} signature:{}", timestamp, nonce, serialNo, signature); + String result = HttpKit.readData(request); + log.info("支付通知密文 {}", result); +// String plainText = null; + // 需要通过证书序列号查找对应的证书，verifyNotify 中有验证证书的序列号 + String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp, + WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath()); + // 微信公钥验证签名并解密 +// if (ObjectUtil.equals(serialNo, WX_PAY_V3_BEAN.getPublicKeyId())) { +// plainText = WxPayKit.verifyPublicKeyNotify(result, signature, nonce, timestamp, +// WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath()); +// } + log.info("支付通知明文 {}", plainText); + if (StrUtil.isNotEmpty(plainText)) { + // 支付结果 + JSONObject jsonResult = JSONUtil.parseObj(plainText); + // 获取缴费记录,并修改缴费结果 + PaymentTransaction transaction = sysUserService.dao().fetch(PaymentTransaction.class, Cnd.where("outTradeNo", "=", jsonResult.getStr("out_trade_no"))); + transaction.setTradingState(TradingStateEnum.PAY_SUCCESS.name()); + transaction.setTransactionId(jsonResult.getStr("transaction_id")); + sysUserService.dao().update(transaction); + + sysUserService.dao().update(MemberPaymentInfo.class, + Chain.make("isPayment", true).add("paymentTime", DateUtil.date()) + .add("paymentMoney", transaction.getTradingAmount()), + Cnd.where("id", "=", transaction.getMemberPaymentInfoId()) + ); + + response.setStatus(200); + map.put("code", "SUCCESS"); + map.put("message", "SUCCESS"); + } else { + response.setStatus(500); + map.put("code", "ERROR"); + map.put("message", "签名错误"); + log.error("签名错误"); + } + + // 支付回调，返回给微信，自己也接收不到结果，这里的返回没用 + response.setHeader("Content-type", ContentType.JSON.toString()); + response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8)); + response.flushBuffer(); + } catch (Exception e) { + log.error("系统异常", e); + } + } + + + /** + * 退款 + * @param transactionId 微信订单号 + * @param outTradeNo 商户订单号 + * @return + */ + @Override + public Result refund(String transactionId, String outTradeNo) { + try { + // 查询商户订单 + PaymentTransaction transaction = sysUserService.dao().fetch(PaymentTransaction.class, Cnd.where("outTradeNo", "=", outTradeNo)); + Integer tradingAmount = transaction.getTradingAmount(); + String outRefundNo = PayKit.generateStr(); + log.info("商户退款单号: {}", outRefundNo); + + // 没用 +// List list = new ArrayList<>(); +// RefundGoodsDetail refundGoodsDetail = new RefundGoodsDetail() +// .setMerchant_goods_id("123") +// .setGoods_name("测试") +// .setUnit_price(1) +// .setRefund_amount(1) +// .setRefund_quantity(1); +// list.add(refundGoodsDetail); + + RefundModel refundModel = new RefundModel() + .setOut_refund_no(outRefundNo) + .setReason(transaction.getDescription() + "退款") + .setNotify_url(refundNotifyUrl) + .setAmount(new RefundAmount().setRefund(tradingAmount).setTotal(tradingAmount).setCurrency("CNY")); +// .setGoods_detail(list); + + if (StrUtil.isNotEmpty(transactionId)) { + refundModel.setTransaction_id(transactionId); + } + if (StrUtil.isNotEmpty(outTradeNo)) { + refundModel.setOut_trade_no(outTradeNo); + } + log.info("退款参数 {}", JSONUtil.toJsonStr(refundModel)); + IJPayHttpResponse response = WxPayApi.v3( + RequestMethodEnum.POST, + WxDomainEnum.CHINA.toString(), + BasePayApiEnum.REFUND.toString(), + WX_PAY_V3_BEAN.getMchId(), + getSerialNumber(), + null, + WX_PAY_V3_BEAN.getKeyPath(), + JSONUtil.toJsonStr(refundModel) + ); + // 根据证书序列号查询对应的证书来验证签名结果 + boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath()); + // 微信支付公钥验证签名 +// boolean verifySignature = WxPayKit.verifyPublicKeySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath()); + log.info("verifySignature: {}", verifySignature); + log.info("退款响应 {}", response); + + if (verifySignature) { + // 用户发起退款，存一个退款记录 + PaymentRefundRecord record = new PaymentRefundRecord(); + record.setId(R.UU32()); + record.setPaymentTransactionId(transaction.getId()); + record.setOutRefundTradeNo(outRefundNo); + record.setRefundNo(null); + record.setRefundState(RefundStateEnum.REFUNDING.name()); + record.setRefundAmount(tradingAmount); + record.setTotal(tradingAmount); + record.setResultJson(response.getBody()); + dao.insert(record); + + dao.update(MemberPaymentInfo.class, Chain.make("isRefund", true) + .add("refundState", RefundStateEnum.REFUNDING.name()), + Cnd.where("id", "=", transaction.getMemberPaymentInfoId())); + + // 返回退款下单结果 + return Result.success(); + } + return Result.error("退款失败"); + } catch (Exception e) { + log.error("系统异常", e); + return Result.error(e.getMessage()); + } + } + + + /** + * 退款回调 + * @param request + * @param response + */ + @Override + @Aop(TransAop.READ_COMMITTED) + public void refundNotify(HttpServletRequest request, HttpServletResponse response) { + Map map = new HashMap<>(12); + try { + String timestamp = request.getHeader("Wechatpay-Timestamp"); + String nonce = request.getHeader("Wechatpay-Nonce"); + String serialNo = request.getHeader("Wechatpay-Serial"); + String signature = request.getHeader("Wechatpay-Signature"); + + log.info("退款通知 timestamp:{} nonce:{} serialNo:{} signature:{}", timestamp, nonce, serialNo, signature); + String result = HttpKit.readData(request); + log.info("退款通知密文 {}", result); +// String plainText = null; + // 需要通过证书序列号查找对应的证书，verifyNotify 中有验证证书的序列号 + String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp, + WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath()); + // 微信公钥验证签名并解密 +// if (ObjectUtil.equals(serialNo, WX_PAY_V3_BEAN.getPublicKeyId())) { +// plainText = WxPayKit.verifyPublicKeyNotify(result, signature, nonce, timestamp, +// WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath()); +// } + log.info("退款通知明文 {}", plainText); + + if (StrUtil.isNotEmpty(plainText)) { + // 取出明文，修改退款的结果 + JSONObject jsonObject = JSONUtil.parseObj(plainText); + // 查询出退款记录，存储关键信息并修改 + PaymentRefundRecord record = dao.fetch(PaymentRefundRecord.class, Cnd.where("outRefundTradeNo", "=", jsonObject.getStr("out_refund_no"))); + record.setRefundNo(jsonObject.getStr("refund_id")); + record.setRefundState(RefundStateEnum.REFUND_SUCCESS.name()); + // 到此是退款成功了，还要去修改订单表的数据 + PaymentTransaction transaction = dao.fetch(PaymentTransaction.class, record.getPaymentTransactionId()); + dao.update(PaymentTransaction.class, Chain.make("isRefund", true) + .add("refundAmount", record.getRefundAmount()), + Cnd.where("id", "=", record.getPaymentTransactionId())); + dao.update(MemberPaymentInfo.class, Chain.make("isPayment", null).add("paymentMoney", null) + .add("refundState", RefundStateEnum.REFUND_SUCCESS.name()), + Cnd.where("id", "=", transaction.getMemberPaymentInfoId())); + + dao.update(record); + response.setStatus(200); + map.put("code", "SUCCESS"); + map.put("message", "SUCCESS"); + } else { + response.setStatus(500); + map.put("code", "ERROR"); + map.put("message", "签名错误"); + } + // 没用 + response.setHeader("Content-type", ContentType.JSON.toString()); + response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8)); + response.flushBuffer(); + } catch (Exception e) { + log.error("系统异常", e); + } + } + + + /** + * 公共方法，获取证书序列号 + * @return + */ + private String getSerialNumber() { + if (StrUtil.isEmpty(serialNo)) { + // 获取证书序列号 + X509Certificate certificate = PayKit.getCertificate(WX_PAY_V3_BEAN.getCertPath()); + if (null != certificate) { + serialNo = certificate.getSerialNumber().toString(16).toUpperCase(); + // 提前两天检查证书是否有效 + boolean isValid = PayKit.checkCertificateIsValid(certificate, WX_PAY_V3_BEAN.getMchId(), -2); + log.info("证书是否可用 {} 证书有效期为 {}", isValid, DateUtil.format(certificate.getNotAfter(), DatePattern.NORM_DATETIME_PATTERN)); + } +// System.out.println("输出证书信息:\n" + certificate.toString()); +// // 输出关键信息，截取部分并进行标记 +// System.out.println("证书序列号:" + certificate.getSerialNumber().toString(16)); +// System.out.println("版本号:" + certificate.getVersion()); +// System.out.println("签发者：" + certificate.getIssuerDN()); +// System.out.println("有效起始日期：" + certificate.getNotBefore()); +// System.out.println("有效终止日期：" + certificate.getNotAfter()); +// System.out.println("主体名：" + certificate.getSubjectDN()); +// System.out.println("签名算法：" + certificate.getSigAlgName()); +// System.out.println("签名：" + certificate.getSignature().toString()); + } + System.out.println("serialNo:" + serialNo); + return serialNo; + } + + + /** + * 公共方法，获取平台证书序列号 + * @return + */ + private String getPlatSerialNumber() { + if (StrUtil.isEmpty(platSerialNo)) { + // 获取平台证书序列号 + X509Certificate certificate = PayKit.getCertificate(FileUtil.getInputStream(WX_PAY_V3_BEAN.getPlatformCertPath())); + platSerialNo = certificate.getSerialNumber().toString(16).toUpperCase(); + } + System.out.println("platSerialNo:" + platSerialNo); + return platSerialNo; + } + + + /** + * 公共方法，保存平台证书 + * @param associatedData + * @param nonce + * @param cipherText + * @param algorithm + * @param certPath + * @return + */ + private String savePlatformCert(String associatedData, String nonce, String cipherText, String algorithm, String certPath) { + try { + String key3 = WX_PAY_V3_BEAN.getApiKey3(); + String publicKey; + if (StrUtil.equals(algorithm, AuthTypeEnum.SM2.getPlatformCertAlgorithm())) { + publicKey = PayKit.sm4DecryptToString(key3, cipherText, nonce, associatedData); + } else { + AesUtil aesUtil = new AesUtil(WX_PAY_V3_BEAN.getApiKey3().getBytes(StandardCharsets.UTF_8)); + // 平台证书密文解密 + // encrypt_certificate 中的 associated_data nonce ciphertext + publicKey = aesUtil.decryptToString( + associatedData.getBytes(StandardCharsets.UTF_8), + nonce.getBytes(StandardCharsets.UTF_8), + cipherText + ); + } + if (StrUtil.isNotEmpty(publicKey)) { + // 保存证书 + FileWriter writer = new FileWriter(certPath); + writer.write(publicKey); + // 获取平台证书序列号 + X509Certificate certificate = PayKit.getCertificate(new ByteArrayInputStream(publicKey.getBytes())); + return certificate.getSerialNumber().toString(16).toUpperCase(); + } + return ""; + } catch (Exception e) { + log.error("保存平台证书异常", e); + return e.getMessage(); + } + } + + + /** + * 公共方法，构建订单关闭时间，默认3分钟 + * @return + */ + private String getNowTimeExpire() { + long currentTimeMillis = System.currentTimeMillis() + 1000 * 60 * 3; + // 将时间戳转换为 DateTime 对象 + DateTime dateTime = DateUtil.date(currentTimeMillis); + return DateUtil.format(dateTime, "yyyy-MM-dd'T'HH:mm:ssXXX"); + } + + + /** + * 公共方法，插入交易订单 + * @param paramVo 交易必填参数Vo + * @param outTradeNo 商户交易号 + * @param result 下单返回结构 + */ + private void insertTradingOrder(WxPayNeedParamVo paramVo, String outTradeNo, String result){ + View_user user = sysUserService.dao().fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId())); + PaymentTransaction transaction = new PaymentTransaction(); + transaction.setId(R.UU32()); + transaction.setMchId(WX_PAY_V3_BEAN.getMchId()); + transaction.setOutTradeNo(outTradeNo); + transaction.setTransactionId(null); + transaction.setTradingChannel(TradingChannelEnum.WX_PAY.name()); + transaction.setTradingType(TradingTypeEnum.PAYMENT.name()); + transaction.setUserId(user.getId()); + transaction.setLoginName(user.getLoginname()); + transaction.setUserName(user.getUsername()); + transaction.setUnitId(user.getUnitId()); + transaction.setUnitName(user.getUnitName()); + transaction.setUnionId(user.getUnionId()); + transaction.setUnionName(user.getUnionName()); + transaction.setTradingState(TradingStateEnum.WAITING_FOR_PAYMENT.name()); + // 获取订单金额 + transaction.setTradingAmount(paramVo.getAmount().getTotal()); + transaction.setIsRefund(false); + transaction.setRefundAmount(null); + transaction.setDescription(paramVo.getDescription()); + transaction.setAttach(paramVo.getAttach()); + transaction.setOpenId(null); + transaction.setResultJson(result); + transaction.setMemberPaymentInfoId(paramVo.getMemberPaymentInfoId()); + sysUserService.dao().insert(transaction); + } +} diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/util/WeChatUtils.java b/src/main/java/com/budwk/app/base/payment/wxpay/util/WeChatUtils.java new file mode 100644 index 00000000..2137a285 --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/util/WeChatUtils.java @@ -0,0 +1,132 @@ +package com.budwk.app.base.payment.wxpay.util; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.constant.RedisConstant; +import lombok.extern.slf4j.Slf4j; +import org.nutz.http.Http; +import org.nutz.integration.jedis.RedisService; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.lang.util.NutMap; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; +import java.net.URLEncoder; +import java.util.Base64; + +/** + * @version 1.0 + * @Author zzr + * @name：WeChatUtils + * @Date 2025/3/10 14:13 + * @注释 + */ +@Slf4j +@IocBean +public class WeChatUtils { + + private static final String ALGORITHM = "AES"; + private static final String KEY = "4eXvXq1ZJmZj8z5z6yXvXq1ZJmZj8z5z"; + + @Inject + private RedisService redisService; + + public static final String APPID = "wxf12fa6175ec7c75f"; + + public static final String SECRET = "f65bbb41d3de4a93c8c93d8e2fd50369"; + + // 获取code + public final static String CODE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; + + //获取网页access_token的接口地址 + public final static String WEB_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=APPSECRET&code=CODE&grant_type=authorization_code"; + + + //获取用户信息地址 + public final static String USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN"; + + // 获取access_token的接口地址（GET） 限2000（次/天） + public final static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"; + // 发送模板消息 + public static final String SEND_MESSAGE_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN"; + + + /** + * 生成获取code的url + * + * @param redirectUrl + * @return + */ + public String getCodeUrl(String redirectUrl, String state) { + String requestUrl = null; + state = state == null ? "" : state; + try { + requestUrl = CODE_URL.replace("APPID", APPID).replace("REDIRECT_URI", URLEncoder.encode(redirectUrl, "UTF-8")).replace("STATE", state); + } catch (Exception e) { + e.printStackTrace(); + } + return requestUrl; + } + + /** + * 获取微信网页access_token 和 openid + * + * @param code + * @return + */ + public JSONObject getWebAccessTokenAndOpenid(String code) { + String requestUrl = WEB_ACCESS_TOKEN_URL.replace("APPID", APPID).replace("APPSECRET", SECRET).replace("CODE", code); + return JSONUtil.parseObj(HttpUtil.post(requestUrl, new JSONObject())); + } + + /** + * 网页授权作用域为snsapi_userinfo，则此时开发者可以通过access_token和openid拉取用户信息了 + * ... + * + * @param webAccessToken + * @param openid + * @return + */ + public JSONObject getUserInfo(String webAccessToken, String openid) { + String requestUrl = USERINFO_URL.replace("ACCESS_TOKEN", webAccessToken).replace("OPENID", openid); + return JSONUtil.parseObj(HttpUtil.post(requestUrl, new JSONObject())); + } + + /** + * 获取access_token 先从Redis获取，如果没有再调微信获取并存Redis + * + * @return + */ + public String getAccessToken() { + String token = redisService.get(RedisConstant.REDIS_KEY_WX_TOKEN); + if (StrUtil.isNotBlank(token)) { + return token; + } + String accessTokenUrl = ACCESS_TOKEN_URL.formatted(APPID, SECRET); + String accessToken = Json.fromJson(NutMap.class, Http.get(accessTokenUrl).getContent()).getString("access_token"); + redisService.setex(RedisConstant.REDIS_KEY_WX_TOKEN, 60 * 60 * 2, accessToken); + return accessToken; + } + + + public String encrypt(String data) throws Exception { + SecretKeySpec keySpec = new SecretKeySpec(KEY.getBytes(), ALGORITHM); + Cipher cipher = Cipher.getInstance(ALGORITHM); + cipher.init(Cipher.ENCRYPT_MODE, keySpec); + byte[] encryptedBytes = cipher.doFinal(data.getBytes()); + return Base64.getEncoder().encodeToString(encryptedBytes); + } + + public String decrypt(String encryptedData) throws Exception { + SecretKeySpec keySpec = new SecretKeySpec(KEY.getBytes(), ALGORITHM); + Cipher cipher = Cipher.getInstance(ALGORITHM); + cipher.init(Cipher.DECRYPT_MODE, keySpec); + byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedData)); + return new String(decryptedBytes); + } + +} diff --git a/src/main/java/com/budwk/app/base/payment/wxpay/vo/WxPayNeedParamVo.java b/src/main/java/com/budwk/app/base/payment/wxpay/vo/WxPayNeedParamVo.java new file mode 100644 index 00000000..5131aa6d --- /dev/null +++ b/src/main/java/com/budwk/app/base/payment/wxpay/vo/WxPayNeedParamVo.java @@ -0,0 +1,37 @@ +package com.budwk.app.base.payment.wxpay.vo; + +import com.ijpay.wxpay.model.v3.Amount; +import com.ijpay.wxpay.model.v3.Payer; +import lombok.Data; + +/** + * @version 1.0 + * @Author zzr + * @name：WxPayNeedParamVo + * @Date 2025/3/7 18:43 + * @注释 + */ +@Data +public class WxPayNeedParamVo { + + /** + * 订单描述，会显示在支付界面的标题，最大长度127，必填 + */ + private String description; + + /** + * 附加数据，订单的详细描述信息，不必填 + */ + private String attach; + + /** + * 金额对象,对象中的 total 是金额，必填； + * 其余参数可不传递也可不填 + */ + private Amount amount; + + /** + * 会员支付信息ID，必填 + */ + private String memberPaymentInfoId; +} diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user_history.java b/src/main/java/com/budwk/app/sys/models/Sys_user_history.java index f82977df..f0b60c5e 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user_history.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user_history.java @@ -1,196 +1,61 @@ package com.budwk.app.sys.models; -import cn.hutool.json.JSONObject; -import com.budwk.app.base.model.BaseModel; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; import org.nutz.lang.util.NutMap; -import java.io.Serializable; import java.util.Date; import java.util.List; @Data +@Accessors(chain = true) @EqualsAndHashCode(callSuper = true) @Table("sys_user_history") @TableMeta("{'mysql-charset':'utf8mb4'}") -@TableIndexes({@Index(name = "INDEX_SYS_USER_HISTORY_LOGINNAMAE", fields = {"loginname"}, unique = false)}) +@TableIndexes({ + @Index(name = "INDEX_HISTORY_USER_LOGINNAMAE", fields = {"loginname"}, unique = false), + @Index(name = "INDEX_HISTORY_USER_UNIT", fields = {"unitId"}, unique = false), +}) @Comment("用户历史记录") -public class Sys_user_history extends BaseModel implements Serializable { - +public class Sys_user_history extends Sys_user { @Name + @Column @Comment("ID") - @ColDefine(type = ColType.VARCHAR, width = 32) @PrevInsert(uu32 = true) + @ColDefine(type = ColType.VARCHAR, width = 32) private String id; @Column - @Comment("用户名") - @ColDefine(type = ColType.VARCHAR, width = 120) - private String loginname; + @Comment("更新时间") + @ColDefine(type = ColType.DATETIME) + private Date changeTime; + /** + * @see com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType + */ @Column - @Comment("姓名") - @ColDefine(type = ColType.VARCHAR, width = 100) - private String username; - - @Column - @Comment("性别") - @ColDefine(type = ColType.VARCHAR, width = 20) - private String sex; - - @Column - @Comment("电子邮箱") - @ColDefine(type = ColType.VARCHAR, width = 255) - private String email; - - @Column - @Comment("手机号码") - @ColDefine(type = ColType.VARCHAR, width = 32) - private String mobile; - - @Column - @Comment("工会ID") - @ColDefine(type = ColType.VARCHAR, width = 32) - private String unionId; - - @Column - @Comment("工会名称") - @ColDefine(type = ColType.VARCHAR, width = 200) - private String unionName; - - @Column - @Comment("单位ID") - @ColDefine(type = ColType.VARCHAR, width = 32) - private String unitId; - - @Column - @Comment("单位名称") - @ColDefine(type = ColType.VARCHAR, width = 200) - private String unitName; - - @Column - @Comment("在职状态") - @ColDefine(type = ColType.VARCHAR, width = 20) - private String userState; - - @Column - @Comment("人事编制") - @ColDefine(type = ColType.VARCHAR, width = 30) - private String preparedBy; - - @Column - @Comment("人员类型") - @ColDefine(type = ColType.VARCHAR, width = 20) - private String personType; - - @Column - @Comment("来校年月") - @ColDefine(type = ColType.VARCHAR, width = 30) - private String comeSchoolDate; - - @Column - @Comment("出生日期") - @ColDefine(type = ColType.DATE) - private Date birthday; - - @Column - @Comment("党政职务") - @ColDefine(type = ColType.VARCHAR, width = 50) - private String governmentPosition; - - @Column - @Comment("技术职称") - @ColDefine(type = ColType.VARCHAR, width = 30) - private String technicalTitle; - - @Column - @Comment("民族") - @ColDefine(type = ColType.VARCHAR, width = 15) - private String nation; - - @Column - @Comment("国籍") - @ColDefine(type = ColType.VARCHAR, width = 30) - private String nationality; - - @Column - @Comment("证件类型") - @ColDefine(type = ColType.VARCHAR, width = 30) - private String icCardType; - - @Column - @Comment("证件号码") - @ColDefine(type = ColType.VARCHAR, width = 30) - private String idCard; - - @Column - @Comment("政治面貌") - @ColDefine(type = ColType.VARCHAR, width = 20) - private String political; - - @Column - @Comment("学历") - @ColDefine(type = ColType.VARCHAR, width = 50) - private String education; - - @Column - @Comment("学位") - @ColDefine(type = ColType.VARCHAR, width = 50) - private String academicDegree; - - @Column - @Comment("个人简况") - @ColDefine(type = ColType.VARCHAR, customType = "text") - private String personalData; - - @Column - @Comment("是否双肩挑") - @ColDefine(type = ColType.BOOLEAN) - private Boolean manyUnit; - - @Column - @Comment("是否会员") - @ColDefine(type = ColType.AUTO) - private Boolean member; - - @Column - @Comment("是否愿意加入重大疾病爱心基金互助会") - @ColDefine(type = ColType.BOOLEAN) - private Boolean wantJoinLoveMutualAidAssociation; - - @Column - @Comment("是否福利会员") - @ColDefine(type = ColType.AUTO) - private Boolean welfareMember; - - @Column - @Comment("异动类型") + @Comment("变更类型(多种)") @ColDefine(type = ColType.MYSQL_JSON) private List changeTypes; @Column - @Comment("家庭成员") - @ColDefine(type = ColType.MYSQL_JSON) - private List families; - - @Column - @Comment("博士后进站时间") - @ColDefine(type = ColType.DATE) - private Date postDoctoralJoinDate; - - @Column - @Comment("异动时间") - @ColDefine(type = ColType.DATETIME) - private Date changeTime; - - @Column - @Comment("异动来源") - @ColDefine(type = ColType.VARCHAR, width = 20) + @Comment("变更来源") + @ColDefine(type = ColType.VARCHAR, width = 50) private String changeOrigin; + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + @Comment("变更原因") + private String changeReason; + + @Column + @Comment("会员变更表记录id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String recordId; + @Column @Comment("详细变更记录,用于查询、列表展示") @ColDefine(type = ColType.MYSQL_JSON) @@ -200,19 +65,4 @@ public class Sys_user_history extends BaseModel implements Serializable { @Comment("详细变更记录,文本类型,可用于导出") @ColDefine(type = ColType.TEXT) private String changeInfosStr; - - @Column - @Comment("变更原因") - @ColDefine(type = ColType.VARCHAR, width = 100) - private String changeReason; - - @Column - @Comment("会员变更记录表") - @ColDefine(type = ColType.VARCHAR, width = 32) - private String recordId; - - @Column - @Comment("变更说明") - @ColDefine(type = ColType.TEXT) - private String remark; } diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index 256dc7c0..09d26758 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -1,23 +1,13 @@ package com.budwk.app.sys.services.impl; -import cn.afterturn.easypoi.excel.ExcelImportUtil; -import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateField; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.thread.AsyncUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.event.user.SysUserEvent; -import com.budwk.app.base.event.user.SysUserPublisher; import com.budwk.app.base.utils.ConditionGroupUtil; -import com.budwk.app.base.utils.ManyAddOrRenewUtil; import com.budwk.app.base.utils.PwdUtil; import com.budwk.app.sys.annotation.DataCenterColumn; import com.budwk.app.sys.models.*; @@ -28,33 +18,23 @@ import com.budwk.app.sys.services.SysRoleService; import com.budwk.app.sys.services.SysUserService; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import com.budwk.app.zhgh.staffmanage.specialstaff.model.SpecialStaff; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.SqlExpressionGroup; 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.random.R; import org.nutz.lang.util.NutMap; -import org.nutz.mvc.Mvcs; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import java.io.File; import java.lang.reflect.Field; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; /** diff --git a/src/main/java/com/budwk/app/sys/views/View_user.java b/src/main/java/com/budwk/app/sys/views/View_user.java index f1570a5e..5f11ec3a 100644 --- a/src/main/java/com/budwk/app/sys/views/View_user.java +++ b/src/main/java/com/budwk/app/sys/views/View_user.java @@ -170,4 +170,8 @@ public class View_user { @Column private Date postDoctoralJoinDate; + + // 福利享受截止日期 + @Column + private Date welfareStopDate; } diff --git a/src/main/java/com/budwk/app/task/services/TaskPlatformService.java b/src/main/java/com/budwk/app/task/services/TaskPlatformService.java index 2ce4dd75..9a05533a 100644 --- a/src/main/java/com/budwk/app/task/services/TaskPlatformService.java +++ b/src/main/java/com/budwk/app/task/services/TaskPlatformService.java @@ -48,4 +48,6 @@ public interface TaskPlatformService { * @return */ List getCronExeTimes(String cronExpression) throws Exception; + + List getCronExeTimesPlus(String cronExpression) throws Exception; } diff --git a/src/main/java/com/budwk/app/task/services/impl/TaskPlatformServiceImpl.java b/src/main/java/com/budwk/app/task/services/impl/TaskPlatformServiceImpl.java index 9330d53b..d1baedaa 100644 --- a/src/main/java/com/budwk/app/task/services/impl/TaskPlatformServiceImpl.java +++ b/src/main/java/com/budwk/app/task/services/impl/TaskPlatformServiceImpl.java @@ -5,6 +5,7 @@ import org.nutz.integration.quartz.QuartzJob; import org.nutz.integration.quartz.QuartzManager; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.quartz.CronExpression; import org.quartz.JobKey; import org.quartz.TriggerUtils; import org.quartz.impl.triggers.CronTriggerImpl; @@ -96,4 +97,22 @@ public class TaskPlatformServiceImpl implements TaskPlatformService { } return list; } + + + @Override + public List getCronExeTimesPlus(String cronExpression) throws Exception { + // 创建一个列表来存储执行时间 + List executionTimes = new ArrayList<>(); + // 创建 CronTriggerImpl 对象，并设置 cron 表达式 + CronTriggerImpl cronTrigger = new CronTriggerImpl(); + cronTrigger.setCronExpression(new CronExpression(cronExpression)); + // 计算未来的执行时间 + List nextExecutionTimes = TriggerUtils.computeFireTimes(cronTrigger, null, 5); + // 格式化日期并添加到执行时间列表中 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + for (Date date : nextExecutionTimes) { + executionTimes.add(dateFormat.format(date)); + } + return executionTimes; + } } diff --git a/src/main/java/com/budwk/app/web/commons/base/Globals.java b/src/main/java/com/budwk/app/web/commons/base/Globals.java index bf67c7b4..02dbf1fd 100644 --- a/src/main/java/com/budwk/app/web/commons/base/Globals.java +++ b/src/main/java/com/budwk/app/web/commons/base/Globals.java @@ -37,6 +37,8 @@ public class Globals { public static String AppDomain = "http://127.0.0.1"; //文件访问域名 public static String AppFileDomain = ""; + //学校代码 + public static String SchoolCode = "HMC"; //系统自定义参数 public static NutMap MyConfig = NutMap.NEW(); //自定义路由 diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java new file mode 100644 index 00000000..535d886d --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareApplyController.java @@ -0,0 +1,11 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.controller; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareApplyController + * @Date 2025/7/31 15:46 + * @注释 + */ +public class ActivityDeclareApplyController { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java new file mode 100644 index 00000000..7aac3faa --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/models/ActivityDeclareInfo.java @@ -0,0 +1,18 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.declare.models; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.Table; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityDeclareInfo + * @Date 2025/7/31 15:38 + * @注释 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ActivityDeclareInfo extends BaseModel { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java new file mode 100644 index 00000000..b36571e5 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java @@ -0,0 +1,11 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.controller; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementApplyController + * @Date 2025/7/31 15:47 + * @注释 + */ +public class ActivityReimbursementApplyController { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java new file mode 100644 index 00000000..bfed79bb --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java @@ -0,0 +1,18 @@ +package com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.models; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.Table; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursement + * @Date 2025/7/31 15:43 + * @注释 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ActivityReimbursementInfo extends BaseModel { +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/contants/Cascader.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/contants/Cascader.java new file mode 100644 index 00000000..2e22f541 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/contants/Cascader.java @@ -0,0 +1,16 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.contants; + +import lombok.Data; + +import java.util.List; + +/** + * 获取活动的树形结构 + */ +@Data +public class Cascader { + + private String value; + private String label; + private List children; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/contants/FitnessWalkMode.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/contants/FitnessWalkMode.java new file mode 100644 index 00000000..ad699815 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/contants/FitnessWalkMode.java @@ -0,0 +1,18 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.contants; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum FitnessWalkMode { + + PUNCH("punch", "打卡"), + STEP_COUNT("stepCount", "计步"), + GPS("gps", "GPS"); + + + private final String value; + private final String desc; + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkActivityBindingRecordController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkActivityBindingRecordController.java new file mode 100644 index 00000000..8bb51c65 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkActivityBindingRecordController.java @@ -0,0 +1,133 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import io.swagger.annotations.ApiOperation; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; + +@IocBean +@Ok("json") +@ApiOperation("健步走-同步绑定记录") +@At("/platform/fitnessWalk/bindingRecord") +public class FitnessWalkActivityBindingRecordController { + + @Inject + private WeAppCloudUtil weAppCloudUtil; + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/bindingRecord.html") + @SaCheckPermission("fitnessWalk.bindingRecord") + public void index() { + } + + /** + * 获取用户绑定记录 + * @param keyWord + * @param unionId + * @param searchName + * @param searchKeyword + * @param pageNumber + * @param pageSize + * @param pageOrderName + * @param pageOrderBy + * @return + * @throws IOException + */ + @At + @ApiOperation("获取用户绑定记录") + @SaCheckPermission("fitnessWalk.bindingRecord") + public Result pageData(@Param("keyWord") String keyWord, + @Param("unionId") String unionId, + @Param("searchName") String searchName, + @Param("searchKeyword") String searchKeyword, + @Param("pageNumber") int pageNumber, @Param("pageSize") int pageSize, + @Param("pageOrderName") String pageOrderName, + @Param("pageOrderBy") String pageOrderBy) { + int skip = (pageNumber == 1 ? 0 : (pageNumber - 1)) * pageSize; + + StringBuilder sql = new StringBuilder("db.collection('login_record')"); + if (StrUtil.isNotBlank(keyWord)) { + sql.append(".where("); + sql.append("_.or(["); + sql.append("{loginname:{$regex:'").append(keyWord).append("',$options:'i'}},"); + sql.append("{username:{$regex:'").append(keyWord).append("',$options:'i'}}"); + sql.append("])"); + sql.append(")"); + } + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + sql.append(".where({'data.unionid':'").append(SecurityUtil.getUnionId()).append("'})"); + } else { + if (Strings.isNotBlank(unionId)) { + sql.append(".where({'data.unionid':'").append(unionId).append("'})"); + } + } + sql.append(".field({ data: false })"); + sql.append(".skip(").append(skip).append(")"); + sql.append(".limit(").append(pageSize).append(")"); + sql.append(".get()"); + + try { + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.QUERY, sql.toString()); + List data = jsonObject.getJSONArray("data").stream() + .map(v -> JSONUtil.toBean((String) v, NutMap.class)) + .collect(Collectors.toList()); + JSONObject pager = jsonObject.getJSONObject("pager"); + Pagination pagination = new Pagination(pageNumber, pageSize, pager.getInt("Total"), data); + return Result.success().addData(pagination); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } + + + /** + * 删除绑定记录 + * @param ids + * @return + */ + @At + @ApiOperation("删除绑定记录") + @SLog(tag = "健步走-同步绑定记录", msg = "删除绑定记录") + @SaCheckPermission("fitnessWalk.bindingRecord") + public Result delete(String[] ids) { + String sql = "db.collection('login_record').where({_id:_.in(" + Json.toJson(ids) + ")}).remove()"; + weAppCloudUtil.request(WeAppCloudUtil.CRUD.DELETE, sql); + return Result.success(); + } + + /** + * 删除所有绑定记录 + * @return + */ + @At + @ApiOperation("删除所有绑定记录") + @SLog(tag = "健步走-同步绑定记录", msg = "删除所有绑定记录") + @SaCheckPermission("fitnessWalk.bindingRecord") + public Result deleteAll() { + String sql = "db.collection('login_record').where({_id: _.neq('0')}).remove()"; + weAppCloudUtil.request(WeAppCloudUtil.CRUD.DELETE, sql); + return Result.success(); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkActivityManageController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkActivityManageController.java new file mode 100644 index 00000000..81a3cd25 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkActivityManageController.java @@ -0,0 +1,337 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_task; +import com.budwk.app.sys.services.SysTaskService; +import com.budwk.app.sys.services.SysUserService; +import com.budwk.app.task.services.TaskPlatformService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.lang.Lang; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.AdaptBy; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.nutz.mvc.upload.TempFile; +import org.nutz.mvc.upload.UploadAdaptor; + +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + + +@IocBean +@Ok("json") +@ApiOperation("健步走-活动管理") +@At("/platform/fitnessWalk/activityManage") +public class FitnessWalkActivityManageController { + @Inject + private WeAppCloudUtil weAppCloudUtil; + @Inject + private SysTaskService sysTaskService; + @Inject + private SysUserService sysUserService; + @Inject + private TaskPlatformService taskPlatformService; + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/activityManage.html") + @SaCheckPermission("fitnessWalk.activityManage") + public void index() { + } + + @At + @ApiOperation("获取活动数据") + @SaCheckPermission("fitnessWalk.activityManage") + public Result pageData(@Param("year") Integer year, @Param("unionId") String unionId, @Param("searchName") String searchName, + @Param("searchKeyword") String searchKeyword, @Param("pageNumber") int pageNumber, + @Param("pageSize") int pageSize, @Param("pageOrderName") String pageOrderName, + @Param("pageOrderBy") String pageOrderBy) { + + int skip = (pageNumber == 1 ? 0 : (pageNumber - 1)) * pageSize; + + StringBuilder sql = new StringBuilder("db.collection('activity')"); + if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { + sql.append("where("); + sql.append("_.or(["); + sql.append("{name:{$regex:'").append(searchKeyword).append("',$options:'i'}}"); + sql.append("{tag:{$regex:'").append(searchKeyword).append("',$options:'i'}}"); + sql.append("])"); + sql.append(")"); + } + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + sql.append(".where({unionId:'").append(SecurityUtil.getUnionId()).append("'})"); + } else if (StrUtil.isNotBlank(unionId)) { + sql.append(".where({unionId:'").append(unionId).append("'})"); + } + sql.append(".skip(").append(skip).append(")"); + sql.append(".limit(").append(pageSize).append(")"); + sql.append(".get()"); + try { + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.QUERY, sql.toString()); + List data = jsonObject.getJSONArray("data").stream() + .map(v -> JSONUtil.toBean((String) v, FitnessWalkActivity.class)) + .collect(Collectors.toList()); + JSONObject pager = jsonObject.getJSONObject("pager"); + Pagination pagination = new Pagination(pageNumber, pageSize, pager.getInt("Total"), data); + return Result.success().addData(pagination); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + + } + + + @At + @ApiOperation("添加活动") + @SLog(tag = "健步走-活动管理", msg = "添加活动") + @SaCheckPermission("fitnessWalk.activityManage") + @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) + public Result doAdd(@Param("fitnessWalkActivity") FitnessWalkActivity fitnessWalkActivity, + @Param("file") TempFile tempFile, + @Param("stepFiles") TempFile[] stepFiles, + @Param("certificateFile") TempFile certificateTempFile) { + try { + //设置时间 + if ("punch".equals(fitnessWalkActivity.getActivityModel())) { + fitnessWalkActivity.setApplyStartTime(fitnessWalkActivity.getApplyTime()[0]); + fitnessWalkActivity.setApplyEndTime(fitnessWalkActivity.getApplyTime()[1]); + } + fitnessWalkActivity.setStartTime(fitnessWalkActivity.getTime()[0]); + fitnessWalkActivity.setEndTime(fitnessWalkActivity.getTime()[1]); + + if (tempFile != null) { + String fileId = weAppCloudUtil.uploadFile("activity/", tempFile.getFile()); + fitnessWalkActivity.setCover(fileId); + } + + if (Lang.isNotEmpty(stepFiles)) { + List stepFileIdList = new ArrayList<>(); + for (TempFile file : stepFiles) { + String fileId = weAppCloudUtil.uploadFile("activity/", file.getFile()); + stepFileIdList.add(fileId); + } + fitnessWalkActivity.setRandomPics(stepFileIdList); + } + + if (certificateTempFile != null) { + String fileId = weAppCloudUtil.uploadFile("activity/", certificateTempFile.getFile()); + fitnessWalkActivity.setCompletionCertificateCover(fileId); + } + + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), RoleConstant.BRANCH_UNION_ADMIN.name()) + && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + fitnessWalkActivity.setUnionId(SecurityUtil.getUnionId()); + } else { + fitnessWalkActivity.setUnionId(""); + } + + fitnessWalkActivity.setNote(fitnessWalkActivity.getNote().replace("\"", "'")); + StringBuilder sql = new StringBuilder(); + sql.append("db.collection('activity').add({data:").append(Json.toJson(fitnessWalkActivity)).append("})"); + + try { + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.INSERT, sql.toString()); + fitnessWalkCommonService.addLotteryTask(fitnessWalkActivity); + fitnessWalkCommonService.addOrEditDoSaveRedis(fitnessWalkActivity); + return Result.success(); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error(); + } + } + + + @At + @Ok("json:full") + @ApiOperation("根据Id获取健步走活动") + @SaCheckPermission("fitnessWalk.activityManage") + public Result findOne(String id) { + return Result.success(fitnessWalkCommonService.getActivity(id)); + } + + @At + @Ok("json") + @ApiOperation("获取附件") + @SaCheckPermission("fitnessWalk.activityManage") + public Result getFile(String pic) { + try { + NutMap res = NutMap.NEW(); + String imgurl = weAppCloudUtil.httpFile(pic); + HashMap imgmap = new HashMap<>(); + imgmap.put("status", "success"); + imgmap.put("name", imgurl.substring(imgurl.lastIndexOf("/") + 1)); + imgmap.put("id", imgurl); + imgmap.put("url", imgurl); + res.setv("img", imgmap); + return Result.success().addData(res); + } catch (Exception e) { + return Result.error(); + } + } + + + @At + @ApiOperation("修改健步走活动") + @SaCheckPermission("fitnessWalk.activityManage") + @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) + public Result doEdit(@Param("fitnessWalkActivity") FitnessWalkActivity fitnessWalkActivity, + @Param("file") TempFile tempFile, + @Param("stepFiles") TempFile[] stepFiles, + @Param("certificateFile") TempFile certificateTempFile) { + //设置时间 + if ("punch".equals(fitnessWalkActivity.getActivityModel())) { + fitnessWalkActivity.setApplyStartTime(fitnessWalkActivity.getApplyTime()[0]); + fitnessWalkActivity.setApplyEndTime(fitnessWalkActivity.getApplyTime()[1]); + } + fitnessWalkActivity.setStartTime(fitnessWalkActivity.getTime()[0]); + fitnessWalkActivity.setEndTime(fitnessWalkActivity.getTime()[1]); + + if (tempFile != null) { + String fileId = weAppCloudUtil.uploadFile("activity/", tempFile.getFile()); + fitnessWalkActivity.setCover(fileId); + } + + if (Lang.isNotEmpty(stepFiles)) { + List stepFileIdList = new ArrayList<>(); + for (TempFile file : stepFiles) { + String fileId = weAppCloudUtil.uploadFile("activity/", file.getFile()); + stepFileIdList.add(fileId); + } + fitnessWalkActivity.setRandomPics(stepFileIdList); + } + + if (certificateTempFile != null) { + String fileId = weAppCloudUtil.uploadFile("activity/", certificateTempFile.getFile()); + fitnessWalkActivity.setCompletionCertificateCover(fileId); + } + + + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), RoleConstant.BRANCH_UNION_ADMIN.name()) + && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + fitnessWalkActivity.setUnionId(SecurityUtil.getUnionId()); + } else { + fitnessWalkActivity.setUnionId(""); + } + + fitnessWalkActivity.setNote(fitnessWalkActivity.getNote().replace("\"", "'")); + + StringBuilder sql = new StringBuilder(); + sql.append("db.collection('activity').doc('") + .append(fitnessWalkActivity.get_id()) + .append("').update({data:").append(Json.toJson(fitnessWalkActivity)).append("})"); + + try { + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.UPDATE, sql.toString()); + fitnessWalkCommonService.addLotteryTask(fitnessWalkActivity); + fitnessWalkCommonService.addOrEditDoSaveRedis(fitnessWalkActivity); + return Result.success(); + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } + + + @At + @ApiOperation("删除健步走活动") + @SLog(tag = "健步走-活动管理", msg = "删除活动") + @SaCheckPermission("fitnessWalk.activityManage") + public Result delete(String id) { + try { + weAppCloudUtil.request(WeAppCloudUtil.CRUD.DELETE, "db.collection('activity').doc('" + id + "').remove()"); + weAppCloudUtil.request(WeAppCloudUtil.CRUD.DELETE, "db.collection('register').where({activity_id:'" + id + "'}).remove()"); + weAppCloudUtil.request(WeAppCloudUtil.CRUD.DELETE, "db.collection('sign').where({activity_id:'" + id + "'}).remove()"); + weAppCloudUtil.request(WeAppCloudUtil.CRUD.DELETE, "db.collection('gift_voucher').where({activity_id:'" + id + "'}).remove()"); + + List sys_tasks = sysTaskService.query(Cnd.where("note", "=", id)); + if (sys_tasks != null) { + sys_tasks.forEach(v -> { + taskPlatformService.delete(v.getId(), v.getId()); + sysTaskService.delete(v.getId()); + }); + + } + return Result.success(); + } catch (Exception e) { + return Result.error(); + } + } + + /** + * 健身走健步模式通知提醒 + * + * @param map + */ + private void addNotifyTask(NutMap map) { + if (map.getBoolean("sendNotify")) { + String id = map.getString("_id"); + String name = map.getString("name"); + String groupId = map.getString("groupId"); + + //提醒频率 + int notifyGap = 10; + + List sys_tasks = sysTaskService.query(Cnd.where("note", "=", id)); + if (Lang.isNotEmpty(sys_tasks)) { + sys_tasks.forEach(v -> { + taskPlatformService.delete(v.getId(), v.getId()); + sysTaskService.delete(v.getId()); + }); + } + + DateTime startTime = DateUtil.date(map.getLong("start_time")); + DateTime endTime = DateUtil.date(map.getLong("end_time")); + + Set result = new HashSet<>(); + DateTime offsetDay = DateUtil.offsetDay(startTime, notifyGap); + while (offsetDay.isBefore(endTime) && offsetDay.isAfter(new Date())) { + result.add(offsetDay); + offsetDay = DateUtil.offsetDay(offsetDay, notifyGap); + } + //活动结束前一天再添加一个日期提醒 + result.add(DateUtil.offsetDay(endTime, -1)); + + for (DateTime dateTime : result) { + Sys_task sys_task = new Sys_task(); + sys_task.setName(name); + sys_task.setNote(id); + sys_task.setJobClass("io.v.nutz.task.job.walking.WalkingNotifyJob"); + sys_task.setData(Json.toJson(Map.of("groupId", groupId))); + sys_task.setDisabled(false); + + String dateFormat = "ss mm HH dd MM ? yyyy"; + SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); + String corn = sdf.format(dateTime); + sys_task.setCron(corn); + + sysTaskService.insert(sys_task); + + taskPlatformService.add(sys_task.getId(), sys_task.getId(), sys_task.getJobClass(), sys_task.getCron(), sys_task.getNote(), sys_task.getData()); + } + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkCommonController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkCommonController.java new file mode 100644 index 00000000..ae74afdf --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkCommonController.java @@ -0,0 +1,52 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * 健身走公共答题 + */ +@IocBean +@At("/platform/fitnessWalk/common") +@Ok("json:full") +public class FitnessWalkCommonController { + +// @Inject +// private QuestionService questionService; +// +// @Inject +// private QuestionIssueService questionIssueService; +// +// @Inject +// private QuestionWorService questionWorService; +// +// @Inject +// private QuestionReplyService questionReplyService; +// +// @At +// public Object getQuestion() { +// return questionService.query(Cnd.where("qflag", "=", 2)); +// } +// +// @At +// public Object getIssueById(String id) { +// List questionIssues = questionIssueService.query(Cnd.where("iqid", "=", id).asc("ipxbh")); +// questionIssues.forEach(issue -> { +// issue.setWors(questionWorService.query(Cnd.where("wiid", "=", issue.getIid()).asc("wpxbh"))); +// }); +// return questionIssues; +// } +// +// @At +// public Object saveAnswer(@Param("reply") Question_reply[] replys) { +// for (Question_reply reply : replys) { +// reply.setSave(false); +// reply.setRidentity(R.UU32()); +// reply.setRtime(DateUtil.getDate()); +// questionReplyService.insert(reply); +// } +// return null; +// } + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkLoginController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkLoginController.java new file mode 100644 index 00000000..0aa14a13 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkLoginController.java @@ -0,0 +1,75 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.services.SysUserService; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @author: Aaron + * @create: 2020-09-11 13:50 + * @description: 小程序登录 + **/ +@At("/platform/fitnessWalk/login") +@Ok("json:full") +@IocBean +public class FitnessWalkLoginController { + + @Inject + private SysUserService sysUserService; + + @At("/") + public Object index(String username, String loginname) { + try { + Sql sql = Sqls.create(""" + SELECT + u.id userid, + u.username, + u.loginname, + u.sex, + u.mobile, + u.birthday, + unit.`name` unitname, + u.unitid, + u.member, + unit.unionid, + un.unionname, + group_concat(sr.`code`) roles + FROM + sys_user u + LEFT JOIN sys_unit unit ON u.unitid = unit.id + LEFT JOIN sys_union un ON unit.unionid = un.id + LEFT JOIN sys_user_role sur ON sur.userId = u.id + LEFT JOIN sys_role sr ON sr.id = sur.roleId + $condition + """).setParam("loginname", loginname).setParam("username", username); + + Cnd cnd = Cnd.NEW(); + cnd.and("LOWER(u.loginname)", "=", loginname.trim().toLowerCase()); + cnd.and("LOWER(u.username)", "=", username.trim().toLowerCase()); + sql.setCondition(cnd); + sql.setCallback(Sqls.callback.map()); + sysUserService.dao().execute(sql); + NutMap user = (NutMap) sql.getResult(); + if (StrUtil.isBlank(user.getString("userid"))) { + return Result.error().addMsg("系统查询不到您的信息，请与工会管理员联系！"); + } +// if(user.getInt("member",0)==0){ +// return Result.error().addMsg("您没有权限参加本次健步行，请与工会管理员联系！"); +// } + /*if (user.getInt("member", 0) != 1 && !user.getString("sex", "").equals("女")) { + return Result.error().addMsg("您没有权限参加本次健步行，请与工会管理员联系！"); + }*/ + return Result.success().addData(user); + } catch (Exception e) { + return Result.error(); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkPunchLotteryController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkPunchLotteryController.java new file mode 100644 index 00000000..d1fbebd6 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkPunchLotteryController.java @@ -0,0 +1,258 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkPunchLottery; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.integration.jedis.RedisService; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.random.R; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.*; +import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Collectors; + +/** + * 打卡抽奖 + */ +@IocBean +@Ok("json") +@ApiOperation("健步走打卡抽奖") +@At("/platform/fitnessWalk/punchLottery") +public class FitnessWalkPunchLotteryController { + + private final ReentrantLock lock = new ReentrantLock(true); + + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + @Inject + private WeAppCloudUtil weAppCloudUtil; + + @Inject + private RedisService redisService; + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/punchLottery.html") + public void index() { + } + + + /** + * 打卡完成之后抽奖 + * + * @param activityId 活动Id + * @param userId 用户Id + * @return + */ + @At + @ApiOperation("打卡模式的抽奖") + public Result judgeWinningToPunch(String activityId, String userId) { + try { + if (StrUtil.isBlank(activityId) && StrUtil.isBlank(userId)) { + return Result.error("参数错误"); + } + + lock.lock(); + int winingCount = fitnessWalkCommonService.dao().count(FitnessWalkPunchLottery.class, Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + if (winingCount > 0) { + return null; + } + + // 把中奖的用户直接存到redis里面去 + String redisKey = this.getClass().getName() + "#judgeWinningToPunch#activityid:" + activityId + "#PRIZELIST:"; + String getPrizeIndexesKey = this.getClass().getName() + "#judgeWinningToPunch#activityid:" + activityId + "#GETPRIZEINDEXES:"; + +// redisService.del(getPrizeIndexesKey); + // 获取奖品列表 + List punchLotteryPrizes = new ArrayList<>(); + String punchLotteryPrizesJson = redisService.get(redisKey); + if (StrUtil.isNotBlank(punchLotteryPrizesJson)) { + punchLotteryPrizes = JSONUtil.toList(punchLotteryPrizesJson, FitnessWalkActivity.PunchLotteryPrize.class); + } else { + JSONObject prizeJsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.QUERY, "db.collection('activity').doc('%s').field({punchLotteryPrizes: true}).get()".formatted(activityId)); + List prizeList = JSONUtil.parseObj((String) prizeJsonObject.getJSONArray("data").get(0)).getJSONArray("punchLotteryPrizes").toList(FitnessWalkActivity.PunchLotteryPrize.class); + redisService.set(redisKey, JSONUtil.toJsonStr(prizeList)); + punchLotteryPrizes = prizeList; + } + + List winningUserIndexList = null; + //奖项，抽取多少个 + int sum = punchLotteryPrizes.stream().mapToInt(v -> Integer.parseInt(v.getNum())).sum(); + //判断是否有key,可以获得奖项的下标数组 + if (!redisService.exists(getPrizeIndexesKey)) { + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.QUERY, "db.collection('register').where({activity_id:'%s'}).count()".formatted(activityId)); + JSONObject pager = jsonObject.getJSONObject("pager"); + String total = pager.getStr("Total"); + //报名人数的一半，从这里的人中取数（最多抽取人数） + Integer lotteryNum = (int) Math.ceil(Double.parseDouble(total) / 2); + winningUserIndexList = generateRandomNumber(1, lotteryNum, sum); + redisService.set(getPrizeIndexesKey, JSONUtil.toJsonStr(winningUserIndexList)); + } else { + String data = redisService.get(getPrizeIndexesKey); + winningUserIndexList = JSONUtil.toList(data, Integer.class); + } + + List punchLotteryList = fitnessWalkCommonService.dao().query(FitnessWalkPunchLottery.class, Cnd.where("activityId", "=", activityId)); + + Sys_user user = fitnessWalkCommonService.dao().fetch(Sys_user.class, Cnd.where("id", "=", userId)); + + FitnessWalkPunchLottery punchLottery = new FitnessWalkPunchLottery(); + punchLottery.setId(R.UU32()); + punchLottery.setActivityId(activityId); + punchLottery.setUserId(userId); + punchLottery.setLoginName(user.getLoginname()); + punchLottery.setUserName(user.getUsername()); + punchLottery.setWinDate(new Date()); + punchLottery.setIsRead(false); + punchLottery.setIsWin(false); + punchLottery.setIsExchange(false); + + if (winningUserIndexList.contains((punchLotteryList.size()))) { + + //奖项map + Map prizeMap = punchLotteryPrizes.stream().collect(Collectors.toMap(FitnessWalkActivity.PunchLotteryPrize::getValue, FitnessWalkActivity.PunchLotteryPrize::getName)); + + //奖项池 + List prizeIdList = new ArrayList<>(); + + punchLotteryPrizes.forEach(v -> { + for (int i = 0; i < Integer.parseInt(v.getNum()); i++) { + prizeIdList.add(v.getValue()); + } + }); + + //已经中奖的奖项ID集合 + List winPrizeIdList = punchLotteryList.stream().filter(FitnessWalkPunchLottery::getIsWin).map(FitnessWalkPunchLottery::getPrizeId).toList(); + winPrizeIdList.forEach(prizeIdList::remove); + + Random random = new Random(); + if (Lang.isNotEmpty(prizeIdList.size())) { + int index = random.nextInt(prizeIdList.size()); + + // 获取随机元素 + String winingPrizeId = prizeIdList.get(index); + String winingPrizeName = prizeMap.get(winingPrizeId); + punchLottery.setPrizeName(winingPrizeName); + punchLottery.setPrizeId(winingPrizeId); + punchLottery.setIsWin(true); + + } + + } + + fitnessWalkCommonService.dao().insert(punchLottery); + if (punchLottery.getIsWin()) { + return Result.success().addData(punchLottery.getPrizeId()); + } else { + return Result.success().addData(null); + } + } catch (Exception e) { + e.printStackTrace(); + return null; + } finally { + if (lock.isLocked()) { + lock.unlock(); + } + } + } + + @At + @ApiOperation("获取中奖记录") + public Result getLotteryRecord(String activityId, String userId) { + List list = fitnessWalkCommonService.dao().query(FitnessWalkPunchLottery.class, Cnd.where("activityId", "=", activityId) + .and("userId", "=", userId)); + return Result.success(list); + } + + + /** + * 兑奖 + * + * @param id + * @return + */ + @At + @ApiOperation("兑奖") + public Result doExchange(String id) { + + int count = fitnessWalkCommonService.dao().count(FitnessWalkPunchLottery.class, Cnd.where("id", "=", id).and("isExchange", "=", 1)); + //返回2 "该二维码已兑奖！" + if (count > 0) { + return Result.success(2); + } + + int update = fitnessWalkCommonService.dao().update(FitnessWalkPunchLottery.class, + Chain.make("isExchange", 1).add("exchangeDate", new Date()), + Cnd.where("id", "=", id)); + return update > 0 ? Result.success() : Result.error(); + } + + + /** + * 改为已读 + * + * @param activityId + * @param userId + * @return + */ + @At + @ApiOperation("改为已读") + public Result doReadLottery(String activityId, String userId) { + fitnessWalkCommonService.dao().update(FitnessWalkPunchLottery.class, Chain.make("isRead", 1), + Cnd.where("userId", "=", userId).and("activityId", "=", activityId)); + return Result.success(); + } + + + /** + * 查看获奖人员 + * + * @return + */ + @At + @ApiOperation("查看获奖人员") + public Result getPunchWining(String activityId) { + List punchLotteryList = fitnessWalkCommonService.dao().query(FitnessWalkPunchLottery.class, + Cnd.where("isWin", "=", 1).and("activityId", "=", activityId)); + return Result.success(punchLotteryList); + } + + + /** + * 抽奖方法的工具类，生成随机数，该随机数为中奖人 + * + * @param minNum 最小值 + * @param maxNum 最多抽取多少人 + * @param count 抽几个 + * @return + */ + public List generateRandomNumber(Integer minNum, Integer maxNum, Integer count) { + Set randomNumbers = new HashSet<>(); + Random rand = new Random(); + //如果是 抽奖人数小于了 奖品数量，会陷入死循环 + if (maxNum <= count) { + for (int i = 0; i <= maxNum; i++) { + randomNumbers.add(i + 1); + } + } else { + while (randomNumbers.size() < count) { + int randomNum = rand.nextInt(maxNum - minNum + 1) + minNum; + randomNumbers.add(randomNum); + } + } + return new ArrayList<>(randomNumbers); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkPunchStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkPunchStatisticsController.java new file mode 100644 index 00000000..a26ffc63 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkPunchStatisticsController.java @@ -0,0 +1,247 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.json.JSONObject; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkPunchStatisticsService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +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.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * 打卡统计 + */ +@IocBean +@Ok("json") +@ApiOperation("健步走打卡统计") +@At("/platform/fitnessWalk/punchStatistics") +public class FitnessWalkPunchStatisticsController { + + @Inject + private Dao dao; + + @Inject + private BaseService baseService; + + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + @Inject + private WeAppCloudUtil weAppCloudUtil; + + @Inject + private FitnessWalkPunchStatisticsService fitnessWalkPunchStatisticsService; + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/punchStatistics.html") + @SaCheckPermission("fitnessWalk.punchStatistics") + public void index() { + } + + /** + * 分工会统计 + * + * @param activityId + * @param unionId + * @return + */ + @At + @Ok("json:full") + @ApiOperation("打卡记录统计") + @SaCheckPermission("fitnessWalk.punchStatistics") + public Result pageData(String activityId, String unionId) { + List list = fitnessWalkPunchStatisticsService.unionRegCheckInNum(activityId, unionId); + return Result.success(list); + } + + @At + @ApiOperation("获取活动列表") + @SaCheckPermission("fitnessWalk.punchStatistics") + public Result getCascadersActivity(@Param("year") int year) { + return Result.success().addData(fitnessWalkCommonService.cascaderActivity(year, FitnessWalkMode.PUNCH)); + } + + @At + @Ok("json:full") + @ApiOperation("根据工会查询获取报名人员") + @SaCheckPermission("fitnessWalk.punchStatistics") + public Result unionRegistrationData(String activityId, String unionId) { + List list = fitnessWalkPunchStatisticsService.unionRegistrationData(activityId, unionId); + return Result.success(list); + } + + @At + @Ok("json:full") + @ApiOperation("根据工会查询获取打卡人员") + @SaCheckPermission("fitnessWalk.punchStatistics") + public Result unionCheckInData(String activityId, String unionId) { + List list = fitnessWalkPunchStatisticsService.unionCheckInData(activityId, unionId); + return Result.success(list); + } + + + @At + @Ok("void") + @ApiOperation("导出各分工会报名人数、打卡人数") + @SaCheckPermission("fitnessWalk.punchStatistics") + public void exportUnionRegCheckInNum(HttpServletResponse response, String activityId) { + List list = fitnessWalkPunchStatisticsService.unionRegCheckInNum(activityId, null); + List entities = new ArrayList<>(); + entities.add(new ExcelExportEntity("分工会", "unionname", 20)); + entities.add(new ExcelExportEntity("报名人数", "regCount", 20)); + entities.add(new ExcelExportEntity("打卡人数", "checkInCount", 20)); + + try { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); + workbook.write(response.getOutputStream()); + + CommonDownloadUtil.download("各分工会统计人数.xlsx", workbook, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + + @At + @Ok("void") + @ApiOperation("导出某个分工会的报名人员") + @SaCheckPermission("fitnessWalk.punchStatistics") + public void exportRegUsers(HttpServletResponse response, String activityId, String unionId) { + Sys_union union = dao.fetch(Sys_union.class, unionId); + String unionName = Optional.ofNullable(union).map(Sys_union::getName).orElse(null); + + List list = fitnessWalkPunchStatisticsService.unionRegistrationData(activityId, unionId); + List entities = new ArrayList<>(); + entities.add(new ExcelExportEntity("工号", "loginname", 20)); + entities.add(new ExcelExportEntity("姓名", "username", 20)); + entities.add(new ExcelExportEntity("单位", "unitname", 20)); + entities.add(new ExcelExportEntity("手机号", "mobile", 20)); + entities.add(new ExcelExportEntity("报名时间", "register_time_str", 20)); + + try { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download("分工会报名人员.xlsx", workbook, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + + @At + @Ok("void") + @ApiOperation("导出某个分工会的打卡人员") + @SaCheckPermission("fitnessWalk.punchStatistics") + public void exportCheckInUsers(HttpServletResponse response, String activityId, String unionId) { + Sys_union union = dao.fetch(Sys_union.class, unionId); + String unionName = Optional.ofNullable(union).map(Sys_union::getName).orElse(null); + + List list = fitnessWalkPunchStatisticsService.unionCheckInData(activityId, unionId); + + for (JSONObject jsonObject : list) { + Boolean used = jsonObject.getBool("used"); + if (used == null) { + jsonObject.put("used", "未取得"); + } else if (used) { + jsonObject.put("used", "已领取"); + } else { + jsonObject.put("used", "未领取"); + } + } + + List entities = new ArrayList<>(); + entities.add(new ExcelExportEntity("工号", "loginname", 20)); + entities.add(new ExcelExportEntity("姓名", "username", 20)); + entities.add(new ExcelExportEntity("单位", "unitname", 20)); + entities.add(new ExcelExportEntity("手机号", "mobile", 20)); + entities.add(new ExcelExportEntity("点位总数", "pts_size", 20)); + entities.add(new ExcelExportEntity("已打卡点位数", "sign_size", 20)); + entities.add(new ExcelExportEntity("礼品券", "used", 20)); + + try { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download(unionName + "分工会报名人员.xlsx", workbook, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +// /** +// * 导出礼品领取情况 +// * @param response +// * @param activityId +// * @param unionId 工会id +// * @param used +// */ +// @At +// @Ok("void") +// public void exportGiftInfo(HttpServletResponse response, String activityId, String unionId, boolean used) { +// +// +// +// } + + + @At + @Ok("void") + @ApiOperation("导出未领取得奖品券用户") + @SaCheckPermission("fitnessWalk.punchStatistics") + public void exportNotGetGiftVoucherUsers(HttpServletResponse response, String activityId) { + List list = fitnessWalkPunchStatisticsService.exportNotGetGiftVoucherUsers(activityId); + List entities = new ArrayList<>(); + entities.add(new ExcelExportEntity("工号", "loginname", 20)); + entities.add(new ExcelExportEntity("姓名", "username", 20)); + entities.add(new ExcelExportEntity("单位", "unitname", 20)); + entities.add(new ExcelExportEntity("手机号", "mobile", 20)); + try { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download("未领取得奖品券人员.xlsx", workbook, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @At + @Ok("void") + @ApiOperation("导出未使用奖品券用户") + @SaCheckPermission("fitnessWalk.punchStatistics") + public void exportNotUseGiftVoucherUsers(HttpServletResponse response, String activityId) { + List list = fitnessWalkPunchStatisticsService.exportNotUseGiftVoucherUsers(activityId); + List entities = new ArrayList<>(); + entities.add(new ExcelExportEntity("工号", "loginname", 20)); + entities.add(new ExcelExportEntity("姓名", "username", 20)); + entities.add(new ExcelExportEntity("单位", "unitname", 20)); + entities.add(new ExcelExportEntity("手机号", "mobile", 20)); + try { + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download("导出未使用礼品券用户.xlsx", workbook, response); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepManageController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepManageController.java new file mode 100644 index 00000000..fd00ffea --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepManageController.java @@ -0,0 +1,403 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkStep; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import com.budwk.app.zhgh.integral.model.IntegralDetail; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.integration.jedis.RedisService; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.util.*; +import java.util.function.BinaryOperator; +import java.util.function.Function; +import java.util.stream.Collectors; + +@IocBean +@Ok("json") +@ApiOperation("健步走步数管理") +@At("/platform/fitnessWalk/stepManage") +public class FitnessWalkStepManageController { + + @Inject + private Dao dao; + @Inject + private BaseService baseService; + @Inject + private RedisService redisService; + @Inject + private WeAppCloudUtil weAppCloudUtil; + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + + /** + * 用户上传一个近31天的步数 + * + * @param activityId 活动id + * @param userId 用户id + * @param monthSteps 步数(当天往前推30天) + * @return + */ + @At + @Ok("json:full") + @Aop(TransAop.READ_COMMITTED) + @SLog(tag = "健步走步数管理", msg = "微信步数上传") + @ApiOperation("上传微信步数，再根据是否开启了积分，自动将步数转化成积分") + public Result updateStepMonth(String activityId, String userId, String monthSteps) { + try { + if (StrUtil.isBlank(userId) || StrUtil.isBlank(monthSteps) || StrUtil.isBlank(activityId)) { + return Result.error("必要参数未传递"); + } + + // 健步走的活动数据 + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + // 是否启用了积分 + boolean isPoints = activity.getIsPoints() != null && activity.getIsPoints(); + + // 使用对象解构获取活动参数 + final Integer standSteps = activity.getLotteryQualificationSteps(); + final Integer standPoints = activity.getLotteryQualificationPoints(); + final Integer otherSteps = activity.getOtherSteps(); + final Integer otherPoints = activity.getOtherPoints(); + final Integer maxPoints = activity.getMaxPoints(); + + String integralNotes = activity.getMasterActivityName() + "所获积分"; + + // 获取到的用户的步数数据 + List steps = Json.fromJsonAsList(NutMap.class, monthSteps); + + //判断数据是否完整 微信运动会在晚上10点多进行步数的更新 会导致31天前的步数获取变为0 所以这里去除掉第一个元素 即为31天前的数据 每次只保存最近30天的数据 + if (Lang.isNotEmpty(steps) && steps.size() == 31) { + steps.remove(0); + } + + // 传递过来的步数数据 + List wxSteps = steps.stream().map(v -> { + FitnessWalkStep step = new FitnessWalkStep(); + step.setActivityId(activityId); + step.setUserId(userId); + step.setStep(v.getInt("step")); + // 计算积分，判断有没有设置，超过达标步数后，每达标XX步数，获得XX积分 + int calculatedPoints = calculatePoints(isPoints, standSteps, standPoints, otherSteps, otherPoints, maxPoints, step.getStep()); + step.setPoints(calculatedPoints); + DateTime date = DateUtil.parse(DateUtil.format(DateUtil.date(v.getLong("timestamp") * 1000), "yyyy-MM-dd"), "yyyy-MM-dd"); + step.setApplyDate(date); + return step; + }).toList(); + + // 传递过来的所有日期的集合 + List dateList = wxSteps.stream().map(FitnessWalkStep::getApplyDate).collect(Collectors.toList()); + + // 去数据库查询日期，这个玩意还要保证插入到数据库的单个日期只有一条,并且这个日期数据库之前有步数，传过来没步数那就要保留数据库的步数 + // 上面日期集合数据库的步数 + List stepList = dao.query(FitnessWalkStep.class, Cnd.where("activityId", "=", activityId) + .and("userId", "=", userId).and("applyDate", "in", dateList)); + + // 这就是保留每天最大步数的集合，那这个集合里面applyDate就是唯一的了 + List dupStepList = new ArrayList<>(stepList.stream() + .collect(Collectors.toMap(FitnessWalkStep::getApplyDate, Function.identity(), + BinaryOperator.maxBy(Comparator.comparing(FitnessWalkStep::getStep)))) + .values()); + + // 这是过滤的相同的applyDate的集合，这些数据要删除 + List delStepIds = stepList.stream() + .filter(step -> !dupStepList.contains(step)) + .map(FitnessWalkStep::getId) + .collect(Collectors.toList()); + + // 数据库的数据 这个map就用于判断数据库的日期和传递过来日期的步数，两个是不是相等的，保留步数多的数据 + Map dateStepMap = dupStepList.stream().collect(Collectors.toMap(FitnessWalkStep::getApplyDate, v -> v)); + + List resultStepList = new ArrayList<>(); + // 这里循环就是，循环的传递过来的数据 + for (FitnessWalkStep step : wxSteps) { + // 数据库存储的步数 + FitnessWalkStep walkStep = dateStepMap.get(step.getApplyDate()); + // 如果数据库没有，那就要新增 + if (Lang.isEmpty(walkStep)) { + resultStepList.add(step); + } else { + // 如果数据库有，那就要保留步数多的 + if (walkStep.getStep() < step.getStep()) { + walkStep.setStep(step.getStep()); + resultStepList.add(walkStep); + } + } + } + + // 最后删除重复日期，更新步数数据 + if (Lang.isNotEmpty(delStepIds)) { + dao.clear(FitnessWalkStep.class, Cnd.where("id", "in", delStepIds)); + if (standSteps != null && standSteps > 0) { + // 删除积分明细 + dao.clear(IntegralDetail.class, Cnd.where("id", "in", delStepIds)); + } + } + if (Lang.isNotEmpty(resultStepList)) { + dao.insertOrUpdate(resultStepList); + if (standSteps != null && standSteps > 0) { + // 增加积分明细 + int year = DateUtil.thisYear(); + List integralDetailList = resultStepList.stream().map(v -> { + IntegralDetail detail = new IntegralDetail(); + detail.setId(v.getId()); + detail.setYear(String.valueOf(year)); + detail.setUserId(userId); + detail.setIntegral(String.valueOf(v.getPoints())); + detail.setIntegralNotes(integralNotes); + detail.setBizId(activityId); + detail.setIntegralTime(v.getApplyDate()); + return detail; + }).toList(); + + List list = integralDetailList.stream().filter(v -> !"0".equals(v.getIntegral())).toList(); + if (Lang.isNotEmpty(list)) { + dao.insertOrUpdate(list); + } + } + } + return Result.success(); + } catch (Exception e){ + e.printStackTrace(); + return Result.error("步数上传失败，请稍后重试，必要时请及时联系管理员"); + } + } + + + /** + * 小程序获取开始时间至今的步数 + * + * @param activityId + * @param userId + * @return + */ + @At + @Ok("json:full") + @ApiOperation("小程序获取开始时间至今的步数") + public Result getActivityDateStep(String activityId, String userId) { + try { + Cnd cnd = Cnd.NEW(); + + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + DateTime startTime = DateUtil.date(activity.getStartTime()); + DateTime endTime = DateUtil.date(activity.getEndTime()); + + cnd.and("activityId", "=", activityId); + cnd.and("userId", "=", userId); + cnd.and("applyDate", ">=", startTime); + cnd.and("applyDate", "<=", endTime); + cnd.asc("applyDate"); + cnd.groupBy("applyDate"); + List stepList = baseService.dao().query(FitnessWalkStep.class, cnd); + + List> collect = stepList.stream().map(v -> { + return Map.of("step", v.getStep(), "timestamp", v.getApplyDate().getTime()); + }).collect(Collectors.toList()); + + return Result.success().addData(collect); + + } catch (Exception e) { + return Result.error(e.getMessage()); + } + } + + @At + @Ok("json:full") + @ApiOperation("获取活动达标的进度条") + public Result getActivityQualifyProgressBar(String activityId, String userId) { + NutMap resultMap = NutMap.NEW(); + + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + //计步的抽奖模式 everyday custom + String lotteryMode = activity.getLotteryMode(); + if ("everyday".equals(lotteryMode)) { + FitnessWalkActivity.DayLotteryRule dayLotteryRule = activity.getDayLotteryRule(); + //每日抽奖资格步数 + Integer lotteryQualificationStep = dayLotteryRule.getLotteryQualificationStep(); + + FitnessWalkStep userWalkStep = baseService.dao().fetch(FitnessWalkStep.class, Cnd.where("userId", "=", userId) + .and("DATE( applyDate )", "=", DateUtil.today()).and("activityId", "=", activityId)); + + int complianceDay = baseService.dao().count(FitnessWalkStep.class, Cnd.where("userId", "=", userId) + .and("DATE( applyDate )", "=", DateUtil.today()).and("activityId", "=", activityId) + .and("step", ">", lotteryQualificationStep)); + + // 今天的步数 + Integer thisDayStep = userWalkStep.getStep(); + + // 去计算达标的百分比 + BigDecimal lotteryQualificationStepBig = new BigDecimal(lotteryQualificationStep); + BigDecimal thisDayStepBig = new BigDecimal(thisDayStep); + //达标的小数，保留四位 + BigDecimal divide = thisDayStepBig.divide(lotteryQualificationStepBig, 4, RoundingMode.HALF_UP); + BigDecimal percentValue = divide.multiply(new BigDecimal("100")); + // 格式化为两位小数 + DecimalFormat decimalFormat = new DecimalFormat("#.##"); + //百分数 + String formattedPercent = decimalFormat.format(percentValue); + + long betweenDay = DateUtil.date(activity.getStartTime()).between(DateUtil.date(activity.getEndTime()), DateUnit.DAY); + NutMap map = new NutMap(); + map.setv("mode", "everyDayLottery"); + //当前达标步数 + map.setv("userStep", thisDayStep); + //达标总步数 + map.setv("complianceSumStep", lotteryQualificationStep); + //达标比例 + map.setv("complianceProportion", Integer.parseInt(formattedPercent)); + //活动天数 + map.setv("betweenDay", betweenDay); + //达标天数 + map.setv("complianceDay", complianceDay); + resultMap.addv("everyDayLotteryMode", map); + } else if ("custom".equals(lotteryMode)) { + List customLotteryRules = activity.getCustomLotteryRules(); + List userWalkSteps = baseService.dao(). + query(FitnessWalkStep.class, Cnd.where("userId", "=", userId) + .and("activityId", "=", activityId) + .and("DATE(applyDate)", ">=", DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd")) + .and("DATE(applyDate)", "<=", DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd")) + ); + + List result = new ArrayList<>(); + + for (FitnessWalkActivity.CustomLotteryRule rule : customLotteryRules) { + NutMap nutMap = NutMap.NEW(); + + List partSteps = userWalkSteps.stream() + .filter(s -> (DateUtil.compare(s.getApplyDate(), rule.getStartDate()) >= 0 && DateUtil.compare(s.getApplyDate(), rule.getEndDate()) <= 0)) + .toList(); + + Integer lotteryQualificationDay = rule.getLotteryQualificationDay(); + Integer lotteryQualificationStep = rule.getLotteryQualificationStep(); + + if (lotteryQualificationDay != null && lotteryQualificationStep != null) { + //每天步数 + nutMap.put("mode", "customLotteryEveryDayStepMode"); + //用户总达标步数 + nutMap.put("userSumStep", partSteps.stream().filter(s -> DateUtil.compare(s.getApplyDate(), new Date(), "yyyy-MM-dd") == 0).findFirst().map(s -> s.getStep()).orElse(0)); + //今天达标步数 + nutMap.put("complianceStep", lotteryQualificationStep); + //总达标步数 + nutMap.put("complianceSumStep", lotteryQualificationDay * lotteryQualificationStep); + //用户当前达标总天数 + nutMap.put("userComplianceSumDay", partSteps.stream().filter(s -> s.getStep() > lotteryQualificationStep).count()); + //总达标天数 + nutMap.put("complianceSumDay", lotteryQualificationDay); + } else if (lotteryQualificationDay == null && lotteryQualificationStep != null) { + //总步数 + nutMap.put("mode", "customLotterySumStepMode"); + //用户总达标步数 + nutMap.put("userSumStep", partSteps.stream().mapToInt(FitnessWalkStep::getStep).sum()); + //总达标步数 + nutMap.put("complianceSumStep", lotteryQualificationStep); + + nutMap.put("title", DateUtil.format(rule.getStartDate(), "MM月dd日") + "至" + DateUtil.format(rule.getEndDate(), "MM月dd日")); + + } + result.add(nutMap); + } + resultMap.addv("customLotteryMode", result); + } + return Result.success().addData(resultMap); + } + + /** + * 获取用户未读的奖 + * + * @param activityId + * @param userId + * @return + */ + @At + @Ok("json:full") + @ApiOperation("获取用户未读的奖") + public Result winningRecord(String activityId, String userId) { + Sql sql = Sqls.create(""" + select awardName,startDate,endDate from fitness_walk_award_user where activityId=@activityId and userId=@userId and isRead=@isRead + """).setParam("activityId",activityId).setParam("userId", userId).setParam("isRead",true); + + /* List awardUsers = baseService.dao().query(FitnessWalkAwardUser.class, + Cnd.where("activityId", "=", activityId) + .and("userId", "=", userId).and("isRead", "=", true));*/ + return Result.success(baseService.listMap(sql)); + } + + + + /** + * 计算积分 + * @param isPointsEnabled + * @param standSteps + * @param standPoints + * @param otherSteps + * @param otherPoints + * @param maxPoints + * @param actualSteps + * @return + */ + private int calculatePoints(boolean isPointsEnabled, + Integer standSteps, Integer standPoints, + Integer otherSteps, Integer otherPoints, + Integer maxPoints, int actualSteps) { + // 基础条件检查 + if (!isPointsEnabled || standSteps == null || standPoints == null || actualSteps < standSteps) { + return 0; + } + + // 计算基础积分 + int totalPoints = standPoints; + + // 计算额外积分 + if (hasExtraPoints(otherSteps, otherPoints)) { + int extraSteps = actualSteps - standSteps; + int extraPoints = (extraSteps / otherSteps) * otherPoints; + totalPoints += extraPoints; + } + + // 应用积分上限 + if (hasMaxPointsLimit(maxPoints)) { + return Math.min(totalPoints, maxPoints); + } + + return totalPoints; + } + + /** + * 检查是否有额外积分规则 + */ + private boolean hasExtraPoints(Integer otherSteps, Integer otherPoints) { + return otherSteps != null && otherPoints != null && otherSteps > 0 && otherPoints > 0; + } + + /** + * 检查是否有积分上限 + */ + private boolean hasMaxPointsLimit(Integer maxPoints) { + return maxPoints != null && maxPoints > 0; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRaffleController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRaffleController.java new file mode 100644 index 00000000..8e5ce2e9 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRaffleController.java @@ -0,0 +1,285 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleRules; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleUser; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkStepRaffleService; +import com.budwk.app.zhgh.integral.model.IntegralDetail; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +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.util.NutMap; +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.util.ArrayList; +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：FitnessWalkStepRaffleController + * @Date 2024/12/27 14:43 + * @注释 健步走抽奖控制器 + */ +@IocBean +@Ok("json") +@ApiOperation("健步走手动抽奖") +@At("/platform/fitnessWalk/stepRaffle") +public class FitnessWalkStepRaffleController { + + @Inject + private Dao dao; + @Inject + private BaseService baseService; + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + @Inject + private FitnessWalkStepRaffleService fitnessWalkStepRaffleService; + + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/stepRaffle.html") + @SaCheckPermission("fitnessWalk.stepRaffle") + public void index() { + } + + + @At + @ApiOperation("获取抽奖列表") + @SaCheckPermission("fitnessWalk.stepRaffle") + public Result pageData(PageForm pageForm, + @Param("activityId") String activityId, + @Param("unionId") String unionId, + @Param("unitId") String unitId){ + Sql sql = fitnessWalkStepRaffleService.getRaffleSql(pageForm, activityId, unionId, unitId); + Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("获取活动级联数据") + @SaCheckPermission("fitnessWalk.stepRaffle") + public Result getCascadersActivity(@Param("year") int year) { + return Result.success().addData(fitnessWalkCommonService.cascaderActivity(year, FitnessWalkMode.STEP_COUNT)); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("设置抽奖规则，并抽奖") + @SLog(tag = "健步走手动抽奖", msg = "设置抽奖规则并抽奖") + @SaCheckPermission("fitnessWalk.stepRaffle") + public Result saveRaffle(FitnessWalkRaffleRules fitnessWalkRaffleRules){ + baseService.dao().insertOrUpdate(fitnessWalkRaffleRules); + fitnessWalkStepRaffleService.manualLottery(fitnessWalkRaffleRules.getActivityId()); + return null; + } + + + @At + @ApiOperation("获取抽奖规则") + @SaCheckPermission("fitnessWalk.stepRaffle") + public Result getRaffle(String activityId){ + FitnessWalkRaffleRules raffleRules = baseService.dao().fetch(FitnessWalkRaffleRules.class, Cnd.where("activityId", "=", activityId)); + return Result.success().addData(raffleRules); + } + + + /** + * 小程序获取奖项信息 + * @param activityId + * @return + */ + @At + @ApiOperation("小程序获取奖项信息") + public Result getAwardList(String activityId){ + List activityAwardList = fitnessWalkStepRaffleService.getActivityAwardList(activityId); + return Result.success().addData(activityAwardList); + } + + + /** + * 小程序获取自己的中奖信息 + * @return + */ + @At + @ApiOperation("小程序获取自己的中奖信息") + public Result getAwardInfo(String activityId, String userId){ + Dao dao = fitnessWalkStepRaffleService.dao(); + FitnessWalkAwardUser awardUser = dao.fetch(FitnessWalkAwardUser.class, Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + FitnessWalkRaffleUser raffleUser = dao.fetch(FitnessWalkRaffleUser.class, Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + + NutMap map = NutMap.NEW(); + if (Lang.isNotEmpty(raffleUser) && !raffleUser.getIsRaffle()) { + if (Lang.isNotEmpty(awardUser)) { + map.put("awardName", awardUser.getAwardName()); + } else { + map.put("awardName", "没有中奖"); + } + map.put("raffleNum", 1); + } else { + map.put("raffleNum", 0); + } + return Result.success().addData(map); + } + + + /** + * 小程序获取查询是否可以抽奖 + * @return + */ + @At + @ApiOperation("小程序获取查询是否可以抽奖") + public Result checkRaffle(String activityId, String userId){ + Dao dao = fitnessWalkStepRaffleService.dao(); + FitnessWalkRaffleUser raffleUser = dao.fetch(FitnessWalkRaffleUser.class, + Cnd.where("activityId", "=", activityId) + .and("userId", "=", userId)); + if (Lang.isNotEmpty(raffleUser)) { + return raffleUser.getIsRaffle() ? Result.error() : Result.success(); + } else { + return Result.error(); + } + } + + + /** + * 抽奖成功后，修改数据库状态 + * @param activityId + * @param userId + * @return + */ + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("抽奖成功后，修改数据库状态") + @SLog(tag = "健步走手动抽奖", msg = "抽奖成功后，修改数据库状态") + public Result updateUserAward(String activityId, String userId) { + fitnessWalkStepRaffleService.dao().update(FitnessWalkAwardUser.class, + Chain.make("isRead", true).add("applyDate", DateUtil.date()), + Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + + fitnessWalkStepRaffleService.dao().update(FitnessWalkRaffleUser.class, + Chain.make("isRaffle", true), + Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + // 增加积分 + FitnessWalkAwardUser awardUser = dao.fetch(FitnessWalkAwardUser.class, Cnd.where("activityId", "=", activityId).and("userId", "=", userId)); + IntegralDetail detail = new IntegralDetail(); + detail.setId(awardUser.getId()); + detail.setYear(String.valueOf(DateUtil.thisYear())); + detail.setUserId(awardUser.getUserId()); + detail.setIntegral(String.valueOf(awardUser.getPoints())); + detail.setIntegralNotes(awardUser.getAwardName()); + detail.setBizId(awardUser.getId()); + detail.setIntegralTime(DateUtil.date()); + dao.insert(detail); + return null; + } + + + @At + @Ok("void") + @ApiOperation("导出中奖名单") + @SaCheckPermission("fitnessWalk.stepRaffle") + public void exportAwardExcel(String searchKeyword, String activityId, + String lotteryTime, HttpServletResponse response) { + Cnd cnd = Cnd.NEW(); + cnd.andEX("activityId", "=", activityId); + cnd.andEX("awardName", "=", lotteryTime); + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("username", searchKeyword); + seg.orLike("loginName", searchKeyword); + cnd.and(seg); + } + cnd.and("isRead", "=", true); + List list = fitnessWalkCommonService.dao().query(FitnessWalkAwardUser.class, cnd); + + for (FitnessWalkAwardUser awardUser : list) { + awardUser.setApplyDate(awardUser.getApplyDate()); + } + + List entityList = new ArrayList<>(); + ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10); + no.setFormat("isAddIndex"); + entityList.add(no); + entityList.add(new ExcelExportEntity("工号", "loginName", 20)); + entityList.add(new ExcelExportEntity("姓名", "username", 20)); + entityList.add(new ExcelExportEntity("分工会", "unionName", 20)); + entityList.add(new ExcelExportEntity("单位", "unitName", 40)); + entityList.add(new ExcelExportEntity("奖项名称", "awardName", 20)); + entityList.add(new ExcelExportEntity("中奖时间", "applyDate2", 20)); + + try { + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, list); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download("健步走中奖人员名单.xlsx", workbook, response); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + @At + @Ok("void") + @ApiOperation("导出健步走达标人员名单") + @SaCheckPermission("fitnessWalk.stepRaffle") + public void exportExcel(String searchKeyword, String activityId, String unionId, + String unitId, HttpServletResponse response) { + PageForm pageForm = new PageForm(); + pageForm.setSearchKeyword(searchKeyword); + Sql sql = fitnessWalkStepRaffleService.getRaffleSql(pageForm, activityId, unionId, unitId); + + List list = fitnessWalkStepRaffleService.listMap(sql); + + List entityList = new ArrayList<>(); + ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10); + no.setFormat("isAddIndex"); + entityList.add(no); + entityList.add(new ExcelExportEntity("工号", "loginname", 20)); + entityList.add(new ExcelExportEntity("姓名", "username", 20)); + entityList.add(new ExcelExportEntity("分工会", "unionname", 20)); + entityList.add(new ExcelExportEntity("单位", "unitname", 40)); + entityList.add(new ExcelExportEntity("达标天数", "standardsDays", 20)); + entityList.add(new ExcelExportEntity("步数", "total_steps", 20)); + + try { + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, list); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download("健步走达标人员名单.xlsx", workbook, response); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java new file mode 100644 index 00000000..4afc3fe3 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepRankingController.java @@ -0,0 +1,274 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +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.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 步数排行榜 + */ +@Slf4j +@IocBean +@Ok("json") +@ApiOperation("健步走步数排行榜") +@At("/platform/fitnessWalk/stepRanking") +public class FitnessWalkStepRankingController { + + @Inject + private BaseService baseService; + + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/stepRanking.html") + @SaCheckPermission("fitnessWalk.stepRanking") + public void index() { + } + + @At + @ApiOperation("获取步数排行榜") + @SaCheckPermission("fitnessWalk.stepRanking") + public Result pageData(PageForm pageForm, + @Param("activityId") String activityId, + @Param("unionId") String unionId, + @Param("unitId") String unitId, + @Param("mode") String mode) { + Pagination pagination = fitnessWalkCommonService.getStepRankingPagination(pageForm, activityId, unionId, unitId, mode); + return Result.success().addData(pagination); + } + + + /** + * 获取所有教工 今天的步数及活动时间范围内的步数 + * + * @param activityId + * @param mode day:今天 all:所有 + * @return {@link Object} + */ + @At + @Ok("json:full") + @ApiOperation("获取今日步数及活动范围内步数") + @SLog(type = "校工会特色活动", tag = "健身走-计步步数排行榜", msg = "小程序接口（获取今日步数及活动范围内步数）") + public Result getUserStepRanking(String activityId, String mode, Integer pageNumber, Integer pageSize) { + if ("day".equals(mode)) { + Sql sql = Sqls.create(""" + SELECT + t.step, + t.applyDate, + u.username + FROM + `fitness_walk_step` t + LEFT JOIN sys_user u ON u.id = t.userId + WHERE + t.activityId = @activityId + AND t.applyDate = @today + GROUP BY u.id + ORDER BY t.step DESC + """); + sql.setParam("activityId", activityId); + sql.setParam("today", DateUtil.today()); + Pagination pagination = baseService.listPageMap(pageNumber, 50, sql); + return Result.success().addData(pagination); + } else if ("week".equals(mode)) { + // 周榜 + Date startOfWeek = DateUtil.beginOfWeek(new Date()); + Date endOfWeek = DateUtil.endOfWeek(new Date()); + + Sql sql = Sqls.create(""" + SELECT + t.userId, + sum( t.step ) AS step, + u.username + FROM + `fitness_walk_step` t + LEFT JOIN sys_user u ON u.id = t.userId + WHERE + t.activityId = @activityId + AND t.applyDate >= @startTime + AND t.applyDate <= @endTime + GROUP BY + t.userId + ORDER BY + step DESC + """); + sql.setParam("activityId", activityId); + sql.setParam("startTime", startOfWeek); + sql.setParam("endTime", endOfWeek); + Pagination pagination = baseService.listPageMap(pageNumber, 50, sql); + return Result.success().addData(pagination); + } else if ("month".equals(mode)) { + // 月榜 + Date firstDayOfMonth = DateUtil.beginOfMonth(new Date()); + Date lastDayOfMonth = DateUtil.endOfMonth(new Date()); + Sql sql = Sqls.create(""" + SELECT + t.userId, + sum( t.step ) AS step, + u.username + FROM + `fitness_walk_step` t + LEFT JOIN sys_user u ON u.id = t.userId + WHERE + t.activityId = @activityId + AND t.applyDate >= @startTime + AND t.applyDate <= @endTime + GROUP BY + t.userId + ORDER BY + step DESC + """); + sql.setParam("activityId", activityId); + sql.setParam("startTime", firstDayOfMonth); + sql.setParam("endTime", lastDayOfMonth); + Pagination pagination = baseService.listPageMap(pageNumber, 50, sql); + return Result.success().addData(pagination); + } else if ("all".equals(mode)) { + // 总达标榜 + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + DateTime startTime = DateUtil.date(activity.getStartTime()); + DateTime endTime = DateUtil.date(activity.getEndTime()); + Sql sql = Sqls.create(""" + SELECT + SUM(sub.max_step) AS step, + u.username + FROM ( + SELECT + userId, + activityId, + applyDate, + MAX(step) AS max_step + FROM + fitness_walk_step + WHERE + activityId = @activityId + AND applyDate >= @startTime AND applyDate <= @endTime + GROUP BY + userId, + activityId, + applyDate + ) sub + left join `user` u ON u.id = sub.userId + GROUP BY + userId + ORDER BY + step desc + """); + sql.setParam("activityId", activityId); + sql.setParam("startTime", startTime); + sql.setParam("endTime", endTime); + Pagination pagination = baseService.listPageMap(pageNumber, 50, sql); + return Result.success().addData(pagination); + } else if ("points".equals(mode)) { + // 积分榜 + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + DateTime startTime = DateUtil.date(activity.getStartTime()); + DateTime endTime = DateUtil.date(activity.getEndTime()); + Sql sql = Sqls.create(""" + SELECT + SUM(sub.max_step) AS step, + u.username + FROM ( + SELECT + userId, + activityId, + applyDate, + MAX(points) AS max_step + FROM + fitness_walk_step + WHERE + activityId = @activityId + AND applyDate >= @startTime AND applyDate <= @endTime + GROUP BY + userId, + activityId, + applyDate + ) sub + left join `user` u ON u.id = sub.userId + GROUP BY + userId + ORDER BY + step desc + """); + sql.setParam("activityId", activityId); + sql.setParam("startTime", startTime); + sql.setParam("endTime", endTime); + Pagination pagination = baseService.listPageMap(pageNumber, 50, sql); + return Result.success().addData(pagination); + } else { + return null; + } + } + + + @At + @Ok("void") + @ApiOperation("步数排行榜导出") + @SaCheckPermission("fitnessWalk.stepRanking") + @SLog(type = "校工会特色活动", tag = "健身走-计步步数排行榜", msg = "步数排行榜导出", param = true, result = true) + public void exportExcel(@Param("searchName") String searchName, + @Param("searchKeyword") String searchKeyword, + @Param("activityId") String activityId, + @Param("unionId") String unionId, + @Param("unitId") String unitId, + @Param("mode") String mode, + HttpServletResponse response) { + List stepRankingList = fitnessWalkCommonService.getStepRankingList(searchName, searchKeyword, activityId, unionId, unitId, mode); + + List entityList = new ArrayList<>(); + ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10); + no.setFormat("isAddIndex"); + entityList.add(no); + entityList.add(new ExcelExportEntity("姓名", "username", 20)); + entityList.add(new ExcelExportEntity("工号", "loginname", 20)); + entityList.add(new ExcelExportEntity("分工会", "unionname", 20)); + entityList.add(new ExcelExportEntity("单位", "unitname", 20)); + entityList.add(new ExcelExportEntity("today".equals(mode) ? "今日步数" : "活动期间总步数", "total_steps", 20)); + try { + String title = ("today".equals(mode) ? DateUtil.format(new Date(), "yyyy年MM月dd日") : "活动期间总") + "步数榜.xlsx"; + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, stepRankingList); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download(title, workbook, response); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @At + @ApiOperation("获取联级活动") + @SaCheckPermission("fitnessWalk.stepRanking") + public Result getCascadersActivity(@Param("year") int year) { + return Result.success().addData(fitnessWalkCommonService.cascaderActivity(year, FitnessWalkMode.STEP_COUNT)); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepStatisticsController.java new file mode 100644 index 00000000..0763ad07 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepStatisticsController.java @@ -0,0 +1,165 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.integration.jedis.RedisService; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +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.util.ArrayList; +import java.util.List; + +@IocBean +@Ok("json") +@ApiOperation("计步步数统计") +@At("/platform/fitnessWalk/stepStatistics") +public class FitnessWalkStepStatisticsController { + + @Inject + private BaseService baseService; + @Inject + private RedisService redisService; + @Inject + private WeAppCloudUtil weAppCloudUtil; + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/stepStatistics.html") + @SaCheckPermission("fitnessWalk.stepStatistics") + public void index() { + } + + /** + * 公共sql + * @return + */ + private String getSql() { + return """ + SELECT + u.loginname, + u.username, + u.unionName AS unionname, + u.unitName AS unitname, + al.applyDate, + al.step, + date_format(al.applyDate,'%Y-%m-%d') as prizeData + FROM + `fitness_walk_step` al + LEFT JOIN `vw_user` u ON u.id = al.userId + $condition + """; + } + + @At + @Ok("json:full") + @ApiOperation("计步步数统计") + @SaCheckPermission("fitnessWalk.stepStatistics") + public Result pageData(PageForm pageForm, + @Param("year") Integer year, + @Param("activityId") String activityId, + @Param("activityDate") String[] activityDate, + @Param("unionId") String unionId, + @Param("unitId") String unitId) { + Cnd cnd = Cnd.NEW(); + Sql sql = Sqls.create(getSql()); + if (Lang.isNotEmpty(activityDate)) { + cnd.and("date_format(al.applyDate,'%Y-%m-%d')", ">=", activityDate[0]); + cnd.and("date_format(al.applyDate,'%Y-%m-%d')", "<=", activityDate[1]); + } + if(StrUtil.isNotBlank(pageForm.getSearchKeyword())){ + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("u.username",pageForm.getSearchKeyword()); + seg.orLike("u.loginname",pageForm.getSearchKeyword()); + cnd.and(seg); + } + cnd.andEX("YEAR(al.applyDate)", "=", year); + cnd.andEX("al.activityId", "=", activityId); + cnd.andEX("u.unionid", "=", unionId); + cnd.andEX("u.unitId", "=", unitId); + cnd.desc("al.applyDate"); + cnd.desc("u.unioncode"); + cnd.groupBy("al.applyDate", "al.userId"); + + sql.setCondition(cnd); + Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("获取联级活动") + @SaCheckPermission("fitnessWalk.stepStatistics") + public Result getCascadersActivity(@Param("year") int year) { + return Result.success().addData(fitnessWalkCommonService.cascaderActivity(year, FitnessWalkMode.STEP_COUNT)); + } + + + @Ok("void") + @At("/exportExcel") + @ApiOperation("计步步数统计表导出") + @SaCheckPermission("fitnessWalk.stepStatistics") + public void exportExcel(@Param("activityId") String activityId, + @Param("activityDate") String[] activityDate, + @Param("unionId") String unionId, + @Param("unitId") String unitId, HttpServletResponse response) { + Cnd cnd = Cnd.NEW(); + Sql sql = Sqls.create(getSql()); + if (activityDate.length > 0) { + cnd.and("date_format(al.applyDate,'%Y-%m-%d')", ">=", activityDate[0]); + cnd.and("date_format(al.applyDate,'%Y-%m-%d')", "<=", activityDate[1]); + } + cnd.andEX("al.activityId", "=", activityId); + cnd.andEX("u.unionid", "=", unionId); + cnd.andEX("u.unitId", "=", unitId); + cnd.desc("al.applyDate"); + cnd.desc("u.unioncode"); + sql.setCondition(cnd); + + List exportList = baseService.listMap(sql); + + List entityList = new ArrayList<>() {{ + add(new ExcelExportEntity("姓名", "username", 20)); + add(new ExcelExportEntity("工号", "loginname", 20)); + add(new ExcelExportEntity("单位", "unitname", 20)); + add(new ExcelExportEntity("分工会", "unionname", 20)); + add(new ExcelExportEntity("当前步数", "step", 20)); + add(new ExcelExportEntity("日期", "prizeData", 20)); + }}; + + try { + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, exportList); + workbook.write(response.getOutputStream()); + CommonDownloadUtil.download("计步步数统计表.xlsx", workbook, response); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepWiningController.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepWiningController.java new file mode 100644 index 00000000..5ca384d5 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/controller/FitnessWalkStepWiningController.java @@ -0,0 +1,155 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Cnd; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +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.BufferedOutputStream; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * 用户中奖榜 + */ +@IocBean +@Ok("json") +@ApiOperation("小程序计步步数中奖榜") +@At("/platform/fitnessWalk/stepWining") +public class FitnessWalkStepWiningController { + + @Inject + private BaseService baseService; + + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + + @At("") + @Ok("beetl:/platform/zhgh/activity/fitnesswalk/stepWining.html") + @SaCheckPermission("fitnessWalk.stepWining") + public void index() { + } + + + /** + * 获取中奖榜 + * + * @param activityId + * @return {@link Object} + */ + @At + @Ok("json:full") + @ApiOperation("小程序获取中奖榜") + @SLog(type = "校工会特色活动",tag = "健身走-计步步数中奖榜",msg = "获取中奖榜") + public Result getUserStepWining(String activityId) { + return Result.success().addData(fitnessWalkCommonService.getWiningRankingUserList(activityId)); + } + + @At + @ApiOperation("获取联级活动") + @SaCheckPermission("fitnessWalk.stepWining") + public Result getCascadersActivity(@Param("year") int year) { + return Result.success().addData(fitnessWalkCommonService.cascaderActivity(year, FitnessWalkMode.STEP_COUNT)); + } + + + @At + @Ok("void") + @ApiOperation("小程序中奖榜导出") + @SaCheckPermission("fitnessWalk.stepWining") + @SLog(type = "校工会特色活动",tag = "健身走-计步步数中奖榜",msg = "导出中奖榜") + public void exportUserStepWining(String activityId, HttpServletResponse response){ + List winingRankingUserList = fitnessWalkCommonService.getWiningRankingUserList(activityId); + List entityList = new ArrayList<>(); + ExcelExportEntity no = new ExcelExportEntity("序号", "no", 10); + no.setFormat("isAddIndex"); + entityList.add(no); + entityList.add(new ExcelExportEntity("工号", "loginName", 20)); + entityList.add(new ExcelExportEntity("姓名", "username", 20)); + entityList.add(new ExcelExportEntity("分工会", "unionName", 20)); + entityList.add(new ExcelExportEntity("单位", "unitName", 40)); + entityList.add(new ExcelExportEntity("奖项名称", "awardName", 20)); + entityList.add(new ExcelExportEntity("步数", "awardSteps", 20)); + entityList.add(new ExcelExportEntity("中奖时间", "applyDate", 20)); + try { + response.setContentType("application/octet-stream"); + response.setHeader("content-disposition", "attachment;filename=" + + URLEncoder.encode("中奖明细.zip", "UTF-8")); + ZipOutputStream zipOutputStream = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); + for (NutMap map : winingRankingUserList) { + List awardList = map.getAsList("awardList", NutMap.class); + awardList.forEach(v->v.setv("applyDate",DateUtil.format(v.getTime("applyDate"),"yyyy-MM-dd"))); + zipOutputStream.putNextEntry(new ZipEntry(map.getString("title") + ".xlsx")); + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, awardList); + workbook.write(zipOutputStream); + zipOutputStream.closeEntry(); + } + zipOutputStream.flush(); + zipOutputStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + + /** + * 中奖奖项列表 + * + * @param activityId + * @return + */ + @At + @ApiOperation("小程序获取中奖奖项列表") + public Result prizeOption(String activityId) { + List list = fitnessWalkCommonService.prizeOption(activityId); + return Result.success(list); + } + + /** + * 中奖用户 + * @param lotteryTime + * @param activityId + * @return + */ + @At + @ApiOperation("小程序获取中奖用户") + public Result prizeUsers(String lotteryTime, String activityId, String searchKeyword) { + Cnd cnd = Cnd.NEW(); + cnd.andEX("activityId", "=", activityId); + cnd.andEX("awardName", "=", lotteryTime); + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("username", searchKeyword); + seg.orLike("loginName", searchKeyword); + cnd.and(seg); + } + cnd.and("isRead", "=", true); + List awardUserList = fitnessWalkCommonService.dao().query(FitnessWalkAwardUser.class, cnd); + return Result.success(awardUserList); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkActivity.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkActivity.java new file mode 100644 index 00000000..6b4823de --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkActivity.java @@ -0,0 +1,235 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.model; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class FitnessWalkActivity { + + @ApiModelProperty(value = "小程序活动Id") + private String _id; + // 主活动名称 + @ApiModelProperty(value = "主活动名称") + private String masterActivityName; + // 分支活动名称 + @ApiModelProperty(value = "分支活动名称") + private String branchActivityName; + // 活动地址 + @ApiModelProperty(value = "活动地址") + private String address; + + @ApiModelProperty(value = "活动礼品") + private String giftName; + + @ApiModelProperty(value = "活动分组Id") + private String groupId; + + @ApiModelProperty(value = "创建分工会Id") + private String unionId; + + @ApiModelProperty(value = "活动模式") + private String activityModel; + + @ApiModelProperty(value = "活动报名时间范围，时间戳模式") + private Long[] applyTime; + + @ApiModelProperty(value = "活动报名开始时间") + private Long applyStartTime; + + @ApiModelProperty(value = "活动报名结束时间") + private Long applyEndTime; + + @ApiModelProperty(value = "活动时间范围，时间戳模式") + private Long[] time; + + @ApiModelProperty(value = "活动开始时间") + private Long startTime; + + @ApiModelProperty(value = "活动结束时间") + private Long endTime; + + @ApiModelProperty(value = "活动描述") + private String note; + + @ApiModelProperty(value = "活动封面") + private String cover; + + @ApiModelProperty(value = "活动临时封面") + private String tempCover; + + @ApiModelProperty(value = "是否需要答题") + private Boolean isQuestion; + + @ApiModelProperty(value = "答题活动Id") + private String questionId; + + @ApiModelProperty(value = "步数模式") + private String speedControlMode; + + //打卡完成之后 gift_voucher:礼品券 cert:完赛证书 null啥也不干 + @ApiModelProperty(value = "打卡完成之后操作") + private String punchFinishAfter; + + //完赛证书 + @ApiModelProperty(value = "完赛证书") + private String completionCertificateCover; + + //完赛证书临时url + @ApiModelProperty(value = "完赛证书临时url") + private String tempCompletionCertificateCover; + + //是否抽奖 + @ApiModelProperty(value = "是否抽奖") + private Boolean isLottery; + + //打卡模式奖品列表 + @ApiModelProperty(value = "打卡完成之后抽奖信息") + private List punchLotteryPrizes; + + @ApiModelProperty(value = "是否显示礼品券") + private Boolean showGiftTicket; + + @ApiModelProperty(value = "知识卡的图片") + private List pts; + + @ApiModelProperty(value = "打开点位，线路") + private List linePoints; + + @ApiModelProperty(value = "打开点位，线路2") + private List linePoints2; + + //是否按顺序签到 + @ApiModelProperty(value = "是否按顺序签到") + private Boolean isOrderSignIn; + + //是否多条线路 + @ApiModelProperty(value = "是否多条线路") + private Boolean isMultipleLines; + + //抽奖模式 none无 everyday每天 monthly每月 custom自定义 + @ApiModelProperty(value = "抽奖模式") + private String lotteryMode; + + //每月抽奖模式抽奖时间 + @ApiModelProperty(value = "每月抽奖模式抽奖时间") + private List everyMonthLotteryTime; + + @ApiModelProperty(value = "自定义模式抽奖抽奖时间规则") + private List customLotteryRules; + + @ApiModelProperty(value = "每日模式抽奖抽奖时间规则") + private DayLotteryRule dayLotteryRule; + + @ApiModelProperty(value = "随机图片数组") + private List randomPics; + + @ApiModelProperty(value = "模板随机图片数组") + private List templateRandomPics; + + @ApiModelProperty(value = "外链地址") + private String externalLinkAddress; + + @ApiModelProperty(value = "是否开启距离限制") + private Boolean enableDistance; + + @ApiModelProperty(value = "签到几个点位算完成") + private Integer finishPointNum; + + @ApiModelProperty(value = "是否自动抽奖") + private Boolean isAutoLottery; + + @ApiModelProperty(value = "手动抽奖，抽奖资格天数") + private Integer lotteryQualificationDays; + + @ApiModelProperty(value = "手动抽奖，抽奖资格步数") + private Integer lotteryQualificationSteps; + + @ApiModelProperty(value = "是否启用积分") + private Boolean isPoints; + + @ApiModelProperty(value = "达标获得积分") + private Integer lotteryQualificationPoints; + + @ApiModelProperty(value = "额外积分的达标步数") + private Integer otherSteps; + + @ApiModelProperty(value = "根据额外步数来计算的额外积分") + private Integer otherPoints; + + @ApiModelProperty(value = "封顶积分") + private Integer maxPoints; + + @Data + public static class Point implements Serializable { + private String type; + private Double[] coordinates; + } + + @Data + public static class Pts implements Serializable { + private int code; + private String name; + private int interval; + private List issueIds; + private Point location; + private int radius; + private String tip; + } + + /** + * 自定义抽奖规则 + */ + @Data + public static class CustomLotteryRule implements Serializable { + //抽奖时间 + private Date lotteryTime; + //抽奖从那天开始计算 + private Date startDate; + //抽奖截至到哪天 + private Date endDate; + //奖项名称 + private String awardName; + //抽奖人数 + private Integer lotteryUserNum; + //抽奖资格步数 + private Integer lotteryQualificationStep; + //抽奖资格天数 + private Integer lotteryQualificationDay; + } + + /** + * 每日抽奖规则 + */ + @Data + public static class DayLotteryRule implements Serializable { + //抽奖资格步数 + private Integer lotteryQualificationStep; + //抽奖资格天数 + private Integer lotteryQualificationDay; + //抽奖人数 + private Integer lotteryUserNum; + //是否可以重复抽奖 + private Boolean repeatLottery; + //是否可以增加抽奖机会 + private Boolean addLotteryChance; + //每日抽奖模式抽奖时间 + private String everyDayLotteryTime; + } + + /** + * 打卡抽奖奖品列表 + */ + @Data + public static class PunchLotteryPrize implements Serializable{ + private String name; + private String value; + private String url; + //份数 + private String num; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkAwardUser.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkAwardUser.java new file mode 100644 index 00000000..20c86852 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkAwardUser.java @@ -0,0 +1,101 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; + +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class FitnessWalkAwardUser extends BaseModel { + + @Column + @Name + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @ColDefine(type = ColType.VARCHAR) + @Comment("活动") + private String activityId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("用户Id") + private String userId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("工号") + private String loginName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("姓名") + private String username; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("奖项名称") + private String awardName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("工会id") + private String unionId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + @Comment("工会名称") + private String unionName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("单位id") + private String unitId; + + @Column + @ColDefine(type = ColType.INT) + @Comment("达标天数") + private Integer standardsDays; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 20) + @Comment("中奖步数") + private String awardSteps; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + @Comment("单位名称") + private String unitName; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("中奖时间") + private Date applyDate; + + @Column + @ColDefine(type = ColType.BOOLEAN) + @Comment("是否已读") + private Boolean isRead; + + @Column + @ColDefine(type = ColType.DATE) + @Comment("开始时间") + private Date startDate; + + @Column + @ColDefine(type = ColType.DATE) + @Comment("结束时间") + private Date endDate; + + @Column + @ColDefine(type = ColType.INT) + @Comment("积分") + private Integer points; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkPunchLottery.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkPunchLottery.java new file mode 100644 index 00000000..bfaac069 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkPunchLottery.java @@ -0,0 +1,78 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Table +@Data +@Comment("打卡模式抽奖记录") +public class FitnessWalkPunchLottery extends BaseModel { + + @Column + @Name + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("活动Id") + private String activityId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("用户Id") + private String userId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + @Comment("用户工号") + private String loginName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + @Comment("中奖用户") + private String userName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 20) + @Comment("奖品名称") + private String prizeName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("奖品") + private String prizeId; + + @Column + @ColDefine(type = ColType.BOOLEAN) + @Comment("是否中奖") + private Boolean isWin; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("中奖时间") + private Date winDate; + + @Column + @ColDefine(type = ColType.BOOLEAN) + @Comment("是否已读") + private Boolean isRead; + + @Column + @ColDefine(type = ColType.DATETIME) + @Comment("兑奖时间") + private Date exchangeDate; + + + @Column + @ColDefine(type = ColType.BOOLEAN) + @Comment("是否兑换") + private Boolean isExchange; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkRaffleRules.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkRaffleRules.java new file mode 100644 index 00000000..4898652f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkRaffleRules.java @@ -0,0 +1,55 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.model; + +import com.budwk.app.base.model.BaseModel; +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 + * @Author zzr + * @name：FitenssWalkRaffleRules + * @Date 2024/12/28 10:05 + * @注释 + */ +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class FitnessWalkRaffleRules extends BaseModel { + + @Column + @Name + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @ColDefine(type = ColType.VARCHAR) + @Comment("活动id") + private String activityId; + + @Column + @ColDefine(type = ColType.MYSQL_JSON) + @Comment("手动抽奖规则") + private List manualLotteryRules; + + @Data + public static class ManualLotteryRules implements Serializable { + // 奖项名称 + private String awardName; + // 奖项积分 + private Integer points; + // 抽奖人数 + private Integer lotteryUserNum; + // 抽奖类型 + private String raffleType; + // 排名位次 + private Integer rankingPosition; + // 是否兼得 + private Boolean isSimultaneously; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkRaffleUser.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkRaffleUser.java new file mode 100644 index 00000000..19e92103 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkRaffleUser.java @@ -0,0 +1,61 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +/** + * @version 1.0 + * @Author zzr + * @name：FitnessWalkRaffleUser + * @Date 2024/12/28 17:10 + * @注释 + */ +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class FitnessWalkRaffleUser extends BaseModel { + + @Column + @Name + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("活动id") + private String activityId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("用户id") + private String userId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + @Comment("用户工号") + private String loginName; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 50) + @Comment("用户姓名") + private String username; + + @Column + @ColDefine(type = ColType.INT) + @Comment("达标天数") + private Integer standardsDays; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 20) + @Comment("中奖步数") + private String awardSteps; + + @Column + @ColDefine(type = ColType.BOOLEAN) + @Comment("是否已抽奖") + private Boolean isRaffle; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkStep.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkStep.java new file mode 100644 index 00000000..a941f73c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/model/FitnessWalkStep.java @@ -0,0 +1,50 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.model; + +import com.budwk.app.base.model.BaseModel; +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.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +//@Table("fitness_walk_step_${month}") +@Table +public class FitnessWalkStep extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + @Column + @Name + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @ColDefine(type = ColType.VARCHAR) + @Comment("活动id") + private String activityId; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("姓名Id") + private String userId; + + @Column + @ColDefine(customType = "int") + @Comment("步数") + private Integer step; + + @Column + @ColDefine(type = ColType.INT) + @Comment("积分") + private Integer points; + + @Column + @ColDefine(type = ColType.DATE) + @Comment("时间") + private Date applyDate; +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java new file mode 100644 index 00000000..30e03419 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkCommonService.java @@ -0,0 +1,86 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.service; + +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.Cascader; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import org.nutz.lang.util.NutMap; + +import java.util.List; + +public interface FitnessWalkCommonService extends BaseService { + + //活动缓存时间 + int CACHE_TIME = 7200; + + /** + * 活动，从Redis中取 + * + * @param activityId 活动id + * @return + */ + FitnessWalkActivity getActivity(String activityId); + + + /** + * 获取所有活动 + * + * @return + */ + List getAllActivity(); + + /** + * 级联活动 + */ + List cascaderActivity(int year, FitnessWalkMode mode); + + + /** + * 添加活动或修改活动，存放至redis + * + * @param activity 活动 + */ + void addOrEditDoSaveRedis(FitnessWalkActivity activity); + + + /** + * 健身走抽奖模式添加定时抽奖任务 + * + * @param fitnessWalkActivity 活动 + */ + void addLotteryTask(FitnessWalkActivity fitnessWalkActivity); + + + /** + * 获取步数排行榜 + * + * @param activityId 活动id + * @param unionId 工会id + * @param unitId 单位id + * @param mode today all + * @return + */ + Pagination getStepRankingPagination(PageForm pageForm, String activityId, String unionId, String unitId, String mode); + + List getStepRankingList(String searchName, String searchKeyword, String activityId, String unionId, String unitId, String mode); + + + /** + * 获取中奖榜 + * + * @param activityId 活动id + * @return + */ + List getWiningRankingUserList(String activityId); + + /** + * 中奖奖项列表 + * @param activityId + * @return + */ + List prizeOption(String activityId); + +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkPunchStatisticsService.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkPunchStatisticsService.java new file mode 100644 index 00000000..8e626fad --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkPunchStatisticsService.java @@ -0,0 +1,20 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.service; + +import cn.hutool.json.JSONObject; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import org.nutz.lang.util.NutMap; + +import java.util.List; + +public interface FitnessWalkPunchStatisticsService extends BaseService { + + List unionRegCheckInNum(String activityId, String unionId); + + List unionRegistrationData(String activityId, String unionId); + + List unionCheckInData(String activityId, String unionId); + + List exportNotGetGiftVoucherUsers(String activityId); + List exportNotUseGiftVoucherUsers(String activityId); +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkStepRaffleService.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkStepRaffleService.java new file mode 100644 index 00000000..f3d24fbc --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/FitnessWalkStepRaffleService.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.service; + +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleRules; +import org.nutz.dao.sql.Sql; +import org.nutz.lang.util.NutMap; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：FitnessWalkStepRaffleService + * @Date 2024/12/28 11:13 + * @注释 + */ +public interface FitnessWalkStepRaffleService extends BaseService { + + Sql getRaffleSql(PageForm pageForm, String activityId, String unionId, String unitId); + + /** + * 获取活动的奖项 + * @param activityId + * @return + */ + List getActivityAwardList(String activityId); + + /** + * 手动抽奖 + * @param activityId 活动id + */ + void manualLottery(String activityId); +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java new file mode 100644 index 00000000..3384be2b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkCommonServiceImpl.java @@ -0,0 +1,492 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.exception.BaseException; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.sys.models.Sys_task; +import com.budwk.app.sys.services.SysTaskService; +import com.budwk.app.task.services.TaskPlatformService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.Cascader; +import com.budwk.app.zhgh.activity.fitnesswalk.contants.FitnessWalkMode; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.Static; +import org.nutz.integration.jedis.RedisService; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.lang.Lang; +import org.nutz.lang.Strings; +import org.nutz.lang.random.R; +import org.nutz.lang.util.NutMap; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +@IocBean(args = {"refer:dao"}) +public class FitnessWalkCommonServiceImpl extends BaseServiceImpl implements FitnessWalkCommonService { + + @Inject + private RedisService redisService; + + @Inject + private WeAppCloudUtil weAppCloudUtil; + + @Inject + private SysTaskService sysTaskService; + + @Inject + private TaskPlatformService taskPlatformService; + + + public FitnessWalkCommonServiceImpl(Dao dao) { + super(dao); + } + + + /** + * 活动，从Redis中取 + * + * @param activityId 活动id + * @return + */ + @Override + public FitnessWalkActivity getActivity(String activityId) { + if (StrUtil.isBlank(activityId)) { + throw new BaseException("请传递活动"); + } + String redisKey = "FitnessWalk:" + activityId; + Boolean exists = redisService.exists("FitnessWalk:" + activityId); + FitnessWalkActivity activity = null; + exists = false; + if (exists) { + String string = redisService.get(redisKey); + activity = JSONUtil.toBean(string, FitnessWalkActivity.class); + if (Lang.isNotEmpty(activity.getRandomPics())) { + List urlStr = new ArrayList<>(); + for (String url : activity.getRandomPics()) { + String tempUrl = weAppCloudUtil.httpFile(url); + urlStr.add(tempUrl); + } + activity.setTemplateRandomPics(urlStr); + redisService.set(redisKey, JSONUtil.toJsonStr(activity)); + } + + if (Strings.isNotBlank(activity.getCover())) { + String tempUrl = weAppCloudUtil.httpFile(activity.getCover()); + activity.setTempCover(tempUrl); + } + + if(Strings.isNotBlank(activity.getCompletionCertificateCover())){ + String tempUrl = weAppCloudUtil.httpFile(activity.getCompletionCertificateCover()); + activity.setTempCompletionCertificateCover(tempUrl); + } + + } else { + StringBuilder sql = new StringBuilder(); + sql.append("db.collection('activity').doc('").append(activityId).append("').get()"); + try { + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.QUERY, sql.toString()); + activity = jsonObject.getJSONArray("data").stream() + .map(v -> JSONUtil.toBean((String) v, FitnessWalkActivity.class)) + .findFirst().orElse(null); + if (Lang.isNotEmpty(activity.getRandomPics())) { + List urlStr = new ArrayList<>(); + for (String url : activity.getRandomPics()) { + String tempUrl = weAppCloudUtil.httpFile(url); + urlStr.add(tempUrl); + } + activity.setTemplateRandomPics(urlStr); + } + if (Strings.isNotBlank(activity.getCover())) { + String tempCover = weAppCloudUtil.httpFile(activity.getCover()); + activity.setTempCover(tempCover); + } + + if(Strings.isNotBlank(activity.getCompletionCertificateCover())){ + String tempUrl = weAppCloudUtil.httpFile(activity.getCompletionCertificateCover()); + activity.setTempCompletionCertificateCover(tempUrl); + } + + redisService.setex(redisKey, CACHE_TIME, JSONUtil.toJsonStr(activity)); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException("获取数据异常!"); + } + } + + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), RoleConstant.BRANCH_UNION_ADMIN.name()) + && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + return SecurityUtil.getUnionId().equals(activity.getUnionId()) ? activity : null; + } + return activity; + } + + + @Override + public List getAllActivity() { + List fitnessWalkActivities; + if (redisService.exists("FitnessWalk:ActivityList")) { + String dataString = redisService.get("FitnessWalk:ActivityList"); + fitnessWalkActivities = JSONUtil.toList(dataString, FitnessWalkActivity.class); + } else { + StringBuilder sql = new StringBuilder(); + sql.append("db.collection('activity').field({") + .append("masterActivityName:true,") + .append("branchActivityName:true,") + .append("activityModel:true,") + .append("endTime:true,") + .append("startTime:true,") + .append("unionId:true") + .append("}).orderBy('startTime', 'desc').get()"); + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.QUERY, sql.toString()); + fitnessWalkActivities = jsonObject.getJSONArray("data").stream() + .map(v -> JSONUtil.toBean((String) v, FitnessWalkActivity.class)).collect(Collectors.toList()); + } + + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name(), RoleConstant.BRANCH_UNION_ADMIN.name()) + && !AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + fitnessWalkActivities = fitnessWalkActivities.stream() + .filter(v -> SecurityUtil.getUnionId().equals(v.getUnionId())) + .collect(Collectors.toList()); + } + redisService.set("FitnessWalk:ActivityList", JSONUtil.toJsonStr(fitnessWalkActivities)); + return fitnessWalkActivities; + } + + + @Override + public List cascaderActivity(int year, FitnessWalkMode mode) { + + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.YEAR, year); + + long startTs = DateUtil.beginOfYear(calendar.getTime()).getTime(); + long endTs = DateUtil.endOfYear(calendar.getTime()).getTime(); + + List cascaders = this.getAllActivity().stream() + .filter(v -> v.getActivityModel().equals(mode.getValue()) && v.getStartTime() >= startTs && v.getStartTime() <= endTs) + .collect(Collectors.groupingBy(FitnessWalkActivity::getMasterActivityName)) + .entrySet().stream() + .map(entry -> { + Cascader cascader = new Cascader(); + cascader.setValue(entry.getValue().stream().findFirst().map(FitnessWalkActivity::get_id).orElse(null)); + cascader.setLabel(entry.getKey()); + if (entry.getValue().size() > 1) { + List children = entry.getValue().stream().map(z -> { + Cascader cascader2 = new Cascader(); + cascader2.setLabel(z.getBranchActivityName()); + cascader2.setValue(z.get_id()); + return cascader2; + }).collect(Collectors.toList()); + cascader.setChildren(children); + } + return cascader; + }) + .collect(Collectors.toList()); + + return cascaders; + } + + @Override + public void addOrEditDoSaveRedis(FitnessWalkActivity activity) { + redisService.del("FitnessWalk:" + activity.get_id()); + redisService.del("FitnessWalk:ActivityList"); + redisService.set("FitnessWalk:" + activity.get_id(), JSONUtil.toJsonStr(activity)); + } + + @Override + public void addLotteryTask(FitnessWalkActivity fitnessWalkActivity) { + //删除和该活动关联的定时任务 + List oldTasks = sysTaskService.dao().query(Sys_task.class, Cnd.where("data", "like", "%" + fitnessWalkActivity.get_id() + "%")); + for (Sys_task task : oldTasks) { + taskPlatformService.delete(task.getId(), task.getId()); + sysTaskService.delete(task.getId()); + } + + + if ("everyday".equals(fitnessWalkActivity.getLotteryMode())) { + FitnessWalkActivity.DayLotteryRule dayLotteryRule = fitnessWalkActivity.getDayLotteryRule(); + if (Lang.isNotEmpty(dayLotteryRule)) { + //每日抽奖时间 + String lotteryTime = dayLotteryRule.getEveryDayLotteryTime(); + SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); + Date timeDate = null; + try { + timeDate = timeFormat.parse(lotteryTime); + } catch (ParseException e) { + throw new RuntimeException(e); + } + String cron = timeDate.getSeconds() + " " + timeDate.getMinutes() + " " + timeDate.getHours() + " * * ?"; + try { + List cronExeTimes = taskPlatformService.getCronExeTimesPlus(cron); + + if (CollectionUtil.isNotEmpty(cronExeTimes)) { + //调用类 + String jobClass = "io.v.nutz.task.job.fitnessWalk.FitnessWalkLotteryJob"; + HashMap map = new HashMap<>(5); + map.put("id", fitnessWalkActivity.get_id()); + // 唯一标识的删除id，用于执行定时任务完成后，将此定时任务禁用 + map.put("deleteId", R.UU32()); + //每天抽奖达标步数 + map.put("lotteryQualificationStep", dayLotteryRule.getLotteryQualificationStep().toString()); + //每天抽奖人数 + map.put("lotteryUserNum", dayLotteryRule.getLotteryUserNum().toString()); + //抽奖模式 + map.put("mode", "everyday"); + + // 设置定时任务 + Sys_task task = new Sys_task(); + task.setName(fitnessWalkActivity.getMasterActivityName() + "健步走计步模式每日抽奖任务"); + task.setJobClass(jobClass); + task.setNote("健步走计步模式每日抽奖任务"); + task.setCron(cron); + task.setData(Json.toJson(map)); + task.setDisabled(false); + sysTaskService.insert(task); + taskPlatformService.add(task.getId(), task.getId(), task.getJobClass(), task.getCron(), task.getNote(), task.getData()); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } else if ("custom".equals(fitnessWalkActivity.getLotteryMode())) { + List customLotteryRules = fitnessWalkActivity.getCustomLotteryRules(); + customLotteryRules.removeIf(Lang::isEmpty); + + for (FitnessWalkActivity.CustomLotteryRule rule : customLotteryRules) { + Date lotteryTime = rule.getLotteryTime(); + SimpleDateFormat dateFormatCron = new SimpleDateFormat("ss mm HH dd MM ? yyyy"); + // 设置定时任务执行时间 + String cron = dateFormatCron.format(lotteryTime); + try { + //调用类 + String jobClass = "io.v.nutz.task.job.fitnessWalk.FitnessWalkLotteryJob"; + HashMap map = new HashMap<>(8); + map.put("id", fitnessWalkActivity.get_id()); + // 唯一标识的删除id，用于执行定时任务完成后，将此定时任务禁用 + map.put("deleteId", R.UU32()); + //月抽奖达标步数 + map.put("lotteryQualificationStep", rule.getLotteryQualificationStep().toString()); + //月抽奖人数 + map.put("lotteryUserNum", rule.getLotteryUserNum().toString()); + //查询开始时间 + map.put("startDate", rule.getStartDate()); + //查询结束时间 + map.put("endDate", rule.getEndDate()); + //抽奖天数 + map.put("lotteryQualificationDay", rule.getLotteryQualificationDay()); + //获奖名称 + map.put("awardName", rule.getAwardName()); + //抽奖模式 + map.put("mode", "custom"); + + Sys_task task = new Sys_task(); + task.setName(fitnessWalkActivity.getMasterActivityName() + "健步走计步模式自定义抽奖任务"); + task.setJobClass(jobClass); + task.setNote("健步走计步模式自定义抽奖任务"); + task.setCron(cron); + task.setData(Json.toJson(map)); + task.setDisabled(false); + sysTaskService.insert(task); + taskPlatformService.add(task.getId(), task.getId(), task.getJobClass(), task.getCron(), task.getNote(), task.getData()); + } catch (Exception e) { + e.printStackTrace(); + return; + } + } + } + } + + + @Override + public Pagination getStepRankingPagination(PageForm pageForm, String activityId, String unionId, String unitId, String mode) { + Sql sql = rankingListSql(pageForm.getSearchName(), pageForm.getSearchKeyword(), activityId, unionId, unitId, mode); + return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + } + + @Override + public List getStepRankingList(String searchName, String searchKeyword, String activityId, String unionId, String unitId, String mode) { + Sql sql = rankingListSql(searchName, searchKeyword, activityId, unionId, unitId, mode); + return listMap(sql); + } + + + /** + * 获取中奖榜 + * + * @param activityId 活动id + * @return + */ + @Override + public List getWiningRankingUserList(String activityId) { + FitnessWalkActivity activity = getActivity(activityId); + List resultMapList = new ArrayList<>(); + if ("everyday".equals(activity.getLotteryMode())) { + String lastDayFormat = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd"); + List awardUserList = dao().query(FitnessWalkAwardUser.class, Cnd.where("activityId", "=", activityId) + .and("DATE( applyDate )", ">=", lastDayFormat)); + + //昨天的中奖榜 + List lastDayAwardUserList = awardUserList.stream().filter(v -> DateUtil.compare(v.getApplyDate(), + DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd") == 0).collect(Collectors.toList()); + NutMap lastDayAwardMap = new NutMap(); + //昨日中奖时间 + lastDayAwardMap.put("title", "昨日中奖榜"); + lastDayAwardMap.put("lotteryTime", lastDayFormat); + lastDayAwardMap.put("awardName", "幸运奖"); + lastDayAwardMap.put("awardList", lastDayAwardUserList); + resultMapList.add(lastDayAwardMap); + + //今天的中奖榜 + List thisDayAwardUserList = (List) CollectionUtil.subtract(awardUserList, lastDayAwardUserList); + NutMap thisDayAwardMap = new NutMap(); + //今日中奖时间 + lastDayAwardMap.put("title", "今日中奖榜"); + thisDayAwardMap.put("lotteryTime", DateUtil.today()); + thisDayAwardMap.put("awardName", "幸运奖"); + thisDayAwardMap.put("awardList", thisDayAwardUserList); + resultMapList.add(thisDayAwardMap); + + } else if ("custom".equals(activity.getLotteryMode())) { + List customLotteryRules = activity.getCustomLotteryRules(); + //当前活动中奖榜单 + List awardUserList = dao().query(FitnessWalkAwardUser.class, Cnd.where("activityId", "=", activityId)); + + for (FitnessWalkActivity.CustomLotteryRule rule : customLotteryRules) { + NutMap map = new NutMap(); + List customAwardList = awardUserList.stream().filter(v -> DateUtil.compare(v.getApplyDate(), DateUtil.date(rule.getLotteryTime()), "yyyy-MM-dd") == 0).collect(Collectors.toList()); + //自定义抽奖时间范围 + map.put("title", DateUtil.format(DateUtil.date(rule.getStartDate()), "MM-dd") + "至" + DateUtil.format(DateUtil.date(rule.getEndDate()), "MM-dd") + rule.getAwardName() + "中奖榜"); +// map.put("customTimeRange", DateUtil.format(DateUtil.date(rule.getStartDate()), "yyyy-MM-dd") + "——" + DateUtil.format(DateUtil.date(rule.getEndDate()), "yyyy-MM-dd")); + //抽奖时间 + map.put("lotteryTime", DateUtil.format(rule.getLotteryTime(), "yyyy-MM-dd")); + //奖项名称 + map.put("awardName", rule.getAwardName()); + //中奖人员 + map.put("awardList", customAwardList); + resultMapList.add(map); + } + } + return resultMapList; + } + + @Override + public List prizeOption(String activityId) { + List list = dao().query(FitnessWalkAwardUser.class, + Cnd.where("activityId", "=", activityId).groupBy("awardName").asc("awardName")); + + List collect = list.stream().map(v -> { + NutMap map = new NutMap(); + map.put("text", v.getAwardName()); + map.put("value", v.getAwardName()); + return map; + }).collect(Collectors.toList()); + + +// FitnessWalkActivity activity = getActivity(activityId); +// if ("custom".equals(activity.getLotteryMode())) { +// List customLotteryRules = activity.getCustomLotteryRules(); +// return customLotteryRules.stream().map(rule -> { +// NutMap map = new NutMap(); +// map.put("text", DateUtil.format(DateUtil.date(rule.getStartDate()), "MM-dd") + "至" + DateUtil.format(DateUtil.date(rule.getEndDate()), "MM-dd") + rule.getAwardName() + "中奖榜"); +// map.put("value", rule.getLotteryTime()); +// return map; +// }).collect(Collectors.toList()); +// } + return collect; + } + + + private Sql rankingListSql(String searchName, String searchKeyword, String activityId, String unionId, String unitId, String mode) { + FitnessWalkActivity activity = getActivity(activityId); + Cnd cnd = Cnd.NEW(); + + Sql sql = Sqls.create(""" + SELECT + u.id, + COALESCE(SUM(sub.step), 0) AS total_steps, + u.username, + u.loginname, + u.unionName, + u.unitName, + over3k.standardsDays + FROM + `vw_user` u + LEFT JOIN ( + SELECT + userId, + applyDate, + step + FROM + `fitness_walk_step` + WHERE + step >= @step + AND activityId=@activityId + AND $dateSql + GROUP BY + userId, + applyDate + ) AS sub ON u.id = sub.userId + LEFT JOIN ( + SELECT + userId, + COUNT(DISTINCT DATE(applyDate)) AS standardsDays + FROM + `fitness_walk_step` + WHERE + step >= @step + AND activityId=@activityId + AND $dateSql + GROUP BY + userId + ) AS over3k ON u.id = over3k.userId + $condition + """).setParam("activityId",activityId).setParam("step",0); + + if ("today".equals(mode)) { + sql.setVar("dateSql",new Static("DATE(applyDate) = '"+DateUtil.today()+"'")); +// cnd.and("DATE( s.applyDate )", "=", DateUtil.today()); + } else { + sql.setVar("dateSql",new Static("DATE(applyDate) >= '" + +DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd")+"' and DATE(applyDate) <= '" + +DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd")+"'")); +// cnd.and("DATE( s.applyDate )", ">=", DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd")); +// cnd.and("DATE( s.applyDate )", "<=", DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd")); + } + + if (Strings.isNotBlank(unitId)) { + cnd.and("u.unitId", "=", unitId); + } + if (Strings.isNotBlank(unionId)) { + cnd.and("u.unionId", "=", unionId); + } + + if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { + cnd.and(searchName, "LIKE", "%" + searchKeyword + "%"); + } +// cnd.and("u.id","in",Sqls.create("select userId from activity_user_scope where groupId = @groupId").setParam("groupId",activity.getGroupId())); + cnd.groupBy("u.id","u.username","u.loginname","u.unionName","u.unitName","over3k.standardsDays"); + cnd.desc("total_steps"); + cnd.having(Cnd.NEW().and("COALESCE(SUM(sub.step), 0)",">",0)); + sql.setCondition(cnd); + return sql; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkPunchStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkPunchStatisticsServiceImpl.java new file mode 100644 index 00000000..f80351b1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkPunchStatisticsServiceImpl.java @@ -0,0 +1,247 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.service.impl; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkPunchStatisticsService; +import com.budwk.app.zhgh.activity.fitnesswalk.utils.WeAppCloudUtil; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@IocBean(args = {"refer:dao"}) +public class FitnessWalkPunchStatisticsServiceImpl extends BaseServiceImpl implements FitnessWalkPunchStatisticsService { + public FitnessWalkPunchStatisticsServiceImpl(Dao dao) { + super(dao); + } + + @Inject + private WeAppCloudUtil weAppCloudUtil; + + @Override + public List unionRegCheckInNum(String activityId, String unionId) { + List unions = dao().query(Sys_union.class, Cnd.NEW().desc("unioncode")); + //查询报名的数据 + StringBuffer regCountSql = new StringBuffer(); + regCountSql.append("db.collection('register').aggregate()"); + regCountSql.append(".match({"); + regCountSql.append("activity_id:'").append(activityId).append("'"); + if (StrUtil.isNotBlank(unionId)) { + regCountSql.append(",unionid:'").append(unionId).append("'"); + } + regCountSql.append("})"); + regCountSql.append(".group({_id:'$unionid',count:$.sum(1)}).end()"); + + JSONObject regCountJsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, regCountSql.toString()); + Map regCountData = regCountJsonObject.getJSONArray("data").stream().map(v -> { + JSONObject rowData = JSONUtil.parseObj((String) v); + String id = rowData.getStr("_id"); + int count = rowData.getJSONObject("count").getInt("$numberInt"); + return NutMap.NEW().addv("id", id).addv("count", count); + }).collect(Collectors.toMap(v -> v.getString("id"), v -> v.getInt("count"))); + + //查询打卡的数据 + StringBuffer checkInCountSql = new StringBuffer(); + checkInCountSql.append("db.collection('sign').aggregate()"); + checkInCountSql.append(".match({"); + checkInCountSql.append("activity_id:'").append(activityId).append("'"); + if (StrUtil.isNotBlank(unionId)) { + checkInCountSql.append(",unionid:'").append(unionId).append("'"); + } + checkInCountSql.append("})"); + checkInCountSql.append(".group({_id:'$unionid',count: $.addToSet('$userid')})"); + checkInCountSql.append(".project({_id: 0,unionid:'$_id',count:$.size('$count')})"); + checkInCountSql.append(".end()"); + + JSONObject checkInCountJsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, checkInCountSql.toString()); + Map checkInCountData = checkInCountJsonObject.getJSONArray("data").stream().map(v -> { + JSONObject rowData = JSONUtil.parseObj((String) v); + String id = rowData.getStr("unionid"); + int count = rowData.getJSONObject("count").getInt("$numberInt"); + return NutMap.NEW().addv("id", id).addv("count", count); + }).collect(Collectors.toMap(v -> v.getString("id"), v -> v.getInt("count"))); + + List list = unions.stream().map(v -> { + String id = v.getId(); + String unionname = v.getName(); + String unioncode = v.getUnionCode(); + + NutMap map = NutMap.NEW(); + map.put("id", id); + map.put("unionname", unionname); + map.put("unioncode", unioncode); + map.put("regCount", regCountData.getOrDefault(id, 0)); + map.put("checkInCount", checkInCountData.getOrDefault(id, 0)); + + return map; + }).collect(Collectors.toList()); + return list; + } + + @Override + public List unionRegistrationData(String activityId, String unionId) { + StringBuffer sql = new StringBuffer("db.collection('register').aggregate()"); + sql.append(".match({"); + sql.append("activity_id:'").append(activityId).append("',unionid:'").append(unionId).append("'"); + sql.append("})"); + sql.append(".addFields({register_time_date:$.toDate('$register_time')})"); + sql.append(""" + .project({ + _id:true, + loginname:true, + username:true, + unitname:true, + mobile:true, + sex:true, + register_time:true, + register_time_str: $.dateToString({ + date: '$register_time_date', + format: '%Y-%m-%d %H:%M:%S', + timezone: 'Asia/Shanghai' + }) + }) + .sort({ unitname: 1 }) + .end() + """); + + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, sql.toString()); + List list = jsonObject.getJSONArray("data").stream().map(v -> JSONUtil.parseObj((String) v)).collect(Collectors.toList()); + return list; + } + + @Override + public List unionCheckInData(String activityId, String unionId) { + // 查询打卡的数据，根据分工会来 + String sql = """ + db.collection('sign').aggregate() + .match({ + activity_id: '%s', + unionid: '%s' + }) + .lookup({ + from: 'activity', + localField: 'activity_id', + foreignField: '_id', + as: 'activity' + }) + .lookup({ + from: 'gift_voucher', + let: { + signActivityId: '$activity_id', + signLoginName: '$loginname' + }, + pipeline: $.pipeline() + .match({ + $expr: { + $and: [ + { $eq: ['$activity_id', '$$signActivityId'] }, + { $eq: ['$loginname', '$$signLoginName'] } + ] + } + }) + .project({ + used: 1, + _id: 0 + }) + .done(), + as: 'gift_voucher' + }) + .addFields({ + used: { $arrayElemAt: ['$gift_voucher.used', 0] }, + masterActivityName: { $arrayElemAt: ['$activity.masterActivityName', 0] }, + pts: { $arrayElemAt: ['$activity.pts', 0] }, + }) + .group({ + _id: { + activity_id: '$activity_id', + loginname: '$loginname' + }, + loginname: { $first: '$loginname' }, + sex: { $first: '$sex' }, + username: { $first: '$username' }, + unitname: { $first: '$unitname' }, + unionname: { $first: '$unionname' }, + used: { $first: '$used' }, + sign_size: { $sum: 1 }, + masterActivityName: { $first: '$masterActivityName' }, + pts_size: { $first: { $size: '$pts' } }, + }) + .project({ + _id: 0, + loginname: 1, + sex: 1, + username: 1, + unitname: 1, + unionname: 1, + used: 1, + sign_size: { $toString: '$sign_size' }, + masterActivityName: 1, + pts_size: { $toString: '$pts_size' } + }) + .sort({ unitname: 1 }) + .end() + """; + sql = sql.formatted(activityId, unionId); + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, sql); + List list = jsonObject.getJSONArray("data").stream().map(v -> { + JSONObject jo = JSONUtil.parseObj((String) v); + if (jo.getInt("sign_size") > jo.getInt("pts_size")) { + jo.put("sign_size", jo.getInt("pts_size")); + } + return jo; + }).collect(Collectors.toList()); + return list; + } + + @Override + public List exportNotGetGiftVoucherUsers(String activityId) { + //查询报名的人员 + JSONObject regJsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, """ + db.collection('register').aggregate([ + { $match: { activity_id: '%s' } } + ]) + .sort({ unitname: 1 }) + .end() + """.formatted(activityId)); + //查询打完卡获得礼品券的人员 + JSONObject giftUserJsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, """ + db.collection('gift_voucher').aggregate() + .match({ activity_id: '%s' }) + .group({ _id: '$loginname' }) + .project({ _id: 0, loginname: '$_id' }) + .end() + """.formatted(activityId)); + + List giftUserLoginNames = giftUserJsonObject.getJSONArray("data").stream().map(v -> { + JSONObject jo = JSONUtil.parseObj((String) v); + return jo.getStr("loginname"); + }).toList(); + + List list = regJsonObject.getJSONArray("data").stream() + .map(v -> JSONUtil.parseObj((String) v)) + .filter(v -> !giftUserLoginNames.contains(v.getStr("loginname"))).collect(Collectors.toList()); + return list; + } + + @Override + public List exportNotUseGiftVoucherUsers(String activityId) { + //查询未使用礼品券的人员 + JSONObject jsonObject = weAppCloudUtil.request(WeAppCloudUtil.CRUD.AGGREGATE, """ + db.collection('gift_voucher').aggregate() + .match({ activity_id: '%s', used: false }) + .sort({ unitname: 1 }) + .end() + """.formatted(activityId)); + return jsonObject.getJSONArray("data").stream() + .map(v -> JSONUtil.parseObj((String) v)).collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkStepRaffleServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkStepRaffleServiceImpl.java new file mode 100644 index 00000000..13e9be54 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/service/impl/FitnessWalkStepRaffleServiceImpl.java @@ -0,0 +1,360 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkActivity; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkAwardUser; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleRules; +import com.budwk.app.zhgh.activity.fitnesswalk.model.FitnessWalkRaffleUser; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkCommonService; +import com.budwk.app.zhgh.activity.fitnesswalk.service.FitnessWalkStepRaffleService; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.dao.util.cri.Static; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.random.R; +import org.nutz.lang.util.NutMap; + +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +/** + * @version 1.0 + * @Author zzr + * @name：FitnessWalkStepRaffleServiceImpl + * @Date 2024/12/28 11:17 + * @注释 + */ +@IocBean(args = {"refer:dao"}) +public class FitnessWalkStepRaffleServiceImpl extends BaseServiceImpl implements FitnessWalkStepRaffleService { + public FitnessWalkStepRaffleServiceImpl(Dao dao) { + super(dao); + } + + @Inject + private FitnessWalkCommonService fitnessWalkCommonService; + + /** + * 获取可抽奖用户，那就是达标用户 + * @param pageForm + * @param activityId + * @param unionId + * @param unitId + * @return + */ + @Override + public Sql getRaffleSql(PageForm pageForm, String activityId, String unionId, String unitId) { + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + + Integer lotteryQualificationDays = activity.getLotteryQualificationDays(); + Integer lotteryQualificationSteps = activity.getLotteryQualificationSteps(); + Date startDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); + Date endDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); + + Cnd cnd = Cnd.NEW(); + Sql sql = Sqls.create(""" + SELECT + u.id, + COALESCE(SUM(sub.step), 0) AS total_steps, + u.loginname, + u.username, + u.unionId, + u.unionName, + u.unitId, + u.unitName, + over3k.standardsDays + FROM + `vw_user` u + LEFT JOIN ( + SELECT + userId, + applyDate, + step + FROM + `fitness_walk_step` + WHERE + activityId = @activityId + AND DATE(applyDate) >= @startDate + AND DATE(applyDate) <= @endDate + $lotteryQualificationDaySql + GROUP BY + userId, + applyDate + ) AS sub ON u.id = sub.userId + LEFT JOIN ( + SELECT + userId, + COUNT(DISTINCT DATE(applyDate)) AS standardsDays + FROM + `fitness_walk_step` + WHERE + activityId = @activityId + AND DATE(applyDate) >= @startDate + AND DATE(applyDate) <= @endDate + $lotteryQualificationDaySql + GROUP BY + userId + ) AS over3k ON u.id = over3k.userId + $condition + """); + if (lotteryQualificationDays != null) { + sql.setVar("lotteryQualificationDaySql", new Static(" AND step >= '%s' ".formatted(lotteryQualificationSteps))); + cnd.having(cnd.and(new Static(" over3k.standardsDays >= '%s' ".formatted(lotteryQualificationDays)))); + +// sql.setVar("stepHavingSql", new Static(" over3k.standardsDays >= '%s' ".formatted(lotteryQualificationDays))); + } else { + cnd.having(cnd.and(new Static(" COALESCE(SUM(sub.step), 0) >= '%s' ".formatted(lotteryQualificationSteps)))); +// sql.setVar("stepHavingSql", new Static(" COALESCE(SUM(sub.step), 0) >= '%s' ".formatted(lotteryQualificationSteps))); + } + sql.setParam("activityId", activityId); + sql.setParam("step", lotteryQualificationSteps); + sql.setParam("startDate", startDate); + sql.setParam("endDate", endDate); + + if (Strings.isNotBlank(unitId)) { + cnd.and("u.unitId", "=", unitId); + } + if (Strings.isNotBlank(unionId)) { + cnd.and("u.unionId", "=", unionId); + } + + if (pageForm != null && Strings.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("u.loginname", pageForm.getSearchKeyword()); + seg.orLike("u.username", pageForm.getSearchKeyword()); + cnd.and(seg); + } +// cnd.and("u.id","in",Sqls.create("select userId from activity_user_scope where groupId = @groupId").setParam("groupId",activity.getGroupId())); + cnd.groupBy("u.id", "u.username", "u.loginname", "u.unionName", "u.unitName"); + cnd.desc("total_steps"); + sql.setCondition(cnd); + return sql; + } + + + /** + * 获取活动的奖项，然后再将奖项去遍历出来 + * @param activityId + * @return { index: 0, name: '奖项名称', type: 0 } + */ + @Override + public List getActivityAwardList(String activityId) { + FitnessWalkRaffleRules rules = fetch(Cnd.where("activityId", "=", activityId)); + List manualLotteryRules = rules.getManualLotteryRules(); + // 存放奖品列表 + List ruleList = new ArrayList<>(); + // 奖品数量 + int size = manualLotteryRules.size(); + if (size == 1) { + String prize = manualLotteryRules.get(0).getAwardName(); + for (int i = 0; i < 8; i++) { + ruleList.add(prize); + if (ruleList.size() < 8) { + ruleList.add("没有中奖"); + } + } + } else if (size == 2) { + for (int i = 0; i < 8; i++) { + String prize = manualLotteryRules.get(i % size).getAwardName(); + ruleList.add(prize); + if (ruleList.size() < 8) { + ruleList.add("没有中奖"); + } + } + } else if (size == 3) { + for (int i = 0; i < 8; ) { + for (int j = 0; j < size && i < 8; j++) { + String prize = manualLotteryRules.get(j).getAwardName(); + ruleList.add(prize); + if (ruleList.size() < 8) { + ruleList.add("没有中奖"); + i += 2; + } + } + } + } else if (size == 4) { + for (int i = 0; i < 8; ) { + for (int j = 0; j < size && i < 8; j++) { + String prize = manualLotteryRules.get(j).getAwardName(); + ruleList.add(prize); + if (ruleList.size() < 8) { + ruleList.add("没有中奖"); + i += 2; + } + } + } + } else if (size == 5) { + ruleList = manualLotteryRules.stream().map(FitnessWalkRaffleRules.ManualLotteryRules::getAwardName).collect(Collectors.toList()); + ruleList.add(2, "没有中奖"); + ruleList.add(4, "没有中奖"); + ruleList.add(7, "没有中奖"); + } else if (size == 6) { + ruleList = manualLotteryRules.stream().map(FitnessWalkRaffleRules.ManualLotteryRules::getAwardName).collect(Collectors.toList()); + ruleList.add(2, "没有中奖"); + ruleList.add(6, "没有中奖"); + } else { + ruleList = manualLotteryRules.stream().map(FitnessWalkRaffleRules.ManualLotteryRules::getAwardName).collect(Collectors.toList()); + ruleList.add("没有中奖"); + } + + List finalRuleList = ruleList; + List awardList = IntStream.range(0, ruleList.size()) + .mapToObj(index -> { + String awardName = finalRuleList.get(index); + NutMap map = NutMap.NEW(); + map.put("index", index); + map.put("name", awardName); + map.put("type", "没有中奖".equals(awardName) ? 1 : 0); + return map; + }).collect(Collectors.toList()); + return awardList; + } + + /** + * 手动抽奖 + * + * @param activityId 活动id + */ + @Override + @Aop(TransAop.READ_COMMITTED) + public void manualLottery(String activityId) { + // 删除此活动下的获奖记录 + dao().clear(FitnessWalkAwardUser.class, Cnd.where("activityId", "=", activityId)); + dao().clear(FitnessWalkRaffleUser.class, Cnd.where("activityId", "=", activityId)); + + FitnessWalkActivity activity = fitnessWalkCommonService.getActivity(activityId); + Date startDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getStartTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); + Date endDate = DateUtil.parse(DateUtil.format(DateUtil.date(activity.getEndTime()), "yyyy-MM-dd"), "yyyy-MM-dd"); + + // 获取达标的所有人，按照步数倒序 + Sql sql = getRaffleSql(null, activityId, null, null); + List list = listMap(sql); + + List raffleUserList = list.stream().map(v -> { + FitnessWalkRaffleUser raffleUser = new FitnessWalkRaffleUser(); + raffleUser.setId(R.UU32()); + raffleUser.setActivityId(activityId); + raffleUser.setUserId(v.getString("id")); + raffleUser.setLoginName(v.getString("loginname")); + raffleUser.setUsername(v.getString("username")); + raffleUser.setAwardSteps(v.getString("total_steps")); + raffleUser.setStandardsDays(v.getInt("standardsDays")); + raffleUser.setIsRaffle(false); + return raffleUser; + }).collect(Collectors.toList()); + dao().fastInsert(raffleUserList); + + Set winningRankLoginNames = new HashSet<>(); + + // 获奖人员 + List winningUsers = new ArrayList<>(); + + // 获取抽奖规则 + FitnessWalkRaffleRules rules = fetch(Cnd.where("activityId", "=", activityId)); + List manualLotteryRules = rules.getManualLotteryRules(); + + // 找出是按照排名来颁奖的奖项 + List ranks = manualLotteryRules.stream().filter(v -> "排名".equals(v.getRaffleType())) + .sorted(Comparator.comparing(FitnessWalkRaffleRules.ManualLotteryRules::getRankingPosition)).toList(); + + for (FitnessWalkRaffleRules.ManualLotteryRules rank : ranks) { + String awardName = rank.getAwardName(); + Integer lotteryUserNum = rank.getLotteryUserNum(); + + // 排除之前获奖的人，再倒序排列 + List canLotteryUsers = list.stream() + .filter(v -> !winningRankLoginNames.contains(v.getString("loginname"))) + .sorted(Comparator.comparingInt((NutMap v) -> v.getInt("total_steps")).reversed()) + .toList(); + + // 截取当前奖项的中奖人员 + List rankNutMaps = canLotteryUsers.subList(0, lotteryUserNum); + // 收集成中奖人员存储 + List collect = rankNutMaps.stream().map(v -> { + FitnessWalkAwardUser awardUser = new FitnessWalkAwardUser(); + awardUser.setId(R.UU32()); + awardUser.setActivityId(activityId); + awardUser.setUserId(v.getString("id")); + awardUser.setLoginName(v.getString("loginname")); + awardUser.setUsername(v.getString("username")); + awardUser.setAwardName(awardName); + awardUser.setStartDate(startDate); + awardUser.setEndDate(endDate); + awardUser.setUnionId(v.getString("unionid")); + awardUser.setUnionName(v.getString("unionName")); + awardUser.setUnitId(v.getString("unitId")); + awardUser.setUnitName(v.getString("unitName")); + awardUser.setStandardsDays(v.getInt("standardsDays")); + awardUser.setAwardSteps(v.getString("total_steps")); + awardUser.setPoints(rank.getPoints()); + return awardUser; + }).toList(); + + winningRankLoginNames.addAll(collect.stream().map(FitnessWalkAwardUser::getLoginName).toList()); + + winningUsers.addAll(collect); + } + + + List reachList = manualLotteryRules.stream().filter(v -> "达标".equals(v.getRaffleType())) + .sorted(Comparator.comparing(FitnessWalkRaffleRules.ManualLotteryRules::getRankingPosition)).toList(); + + for (FitnessWalkRaffleRules.ManualLotteryRules reach : reachList) { + List nutMaps; + if (reach.getIsSimultaneously() != null && reach.getIsSimultaneously()) { + // 可以兼得, 达标了的抽奖就是全部达标的人 + nutMaps = list; + } else { + // 不可兼得， 这里要排除其他奖项的中奖人员 + nutMaps = list.stream().filter(v -> !winningRankLoginNames.contains(v.getString("loginname"))).collect(Collectors.toList()); + } + + // 抽奖人数 + Integer lotteryUserNum = reach.getLotteryUserNum(); + // 奖项名称 + String awardName = reach.getAwardName(); + + // 这里是随机打乱了再去抽奖 + List reachNutMaps = nutMaps.stream().collect(Collectors.collectingAndThen(Collectors.toList(), collected -> { + int size = Math.min(lotteryUserNum, collected.size()); + Collections.shuffle(collected); + return collected.subList(0, size); + })); + + List collect = reachNutMaps.stream().map(v -> { + FitnessWalkAwardUser awardUser = new FitnessWalkAwardUser(); + awardUser.setId(R.UU32()); + awardUser.setActivityId(activityId); + awardUser.setUserId(v.getString("id")); + awardUser.setLoginName(v.getString("loginname")); + awardUser.setUsername(v.getString("username")); + awardUser.setAwardName(awardName); + awardUser.setStartDate(startDate); + awardUser.setEndDate(endDate); + awardUser.setUnionId(v.getString("unionid")); + awardUser.setUnionName(v.getString("unionName")); + awardUser.setUnitId(v.getString("unitId")); + awardUser.setUnitName(v.getString("unitName")); + awardUser.setStandardsDays(v.getInt("standardsDays")); + awardUser.setAwardSteps(v.getString("total_steps")); + awardUser.setPoints(reach.getPoints()); + return awardUser; + }).toList(); + + winningRankLoginNames.addAll(collect.stream().map(FitnessWalkAwardUser::getLoginName).toList()); + + winningUsers.addAll(collect); + } + + dao().fastInsert(winningUsers); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/utils/WeAppCloudUtil.java b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/utils/WeAppCloudUtil.java new file mode 100644 index 00000000..84e0b52d --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/activity/fitnesswalk/utils/WeAppCloudUtil.java @@ -0,0 +1,170 @@ +package com.budwk.app.zhgh.activity.fitnesswalk.utils; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.constant.RedisConstant; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import org.nutz.integration.jedis.RedisService; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +/** + * 微信小程序云开发工具类 + */ +@IocBean +public class WeAppCloudUtil { + public static String ENV = "zufe-6guuuwl17ba1b011"; + + private static final String APPID = "wx093225a38487550f"; + + private static final String APP_SECRET = "23e506ca150f342e9afdcd772cced34a"; + + @Inject + public RedisService redisService; + + public JSONObject request(CRUD crud, String sql) { + String url = crud.url.replace("ACCESS_TOKEN", getAccessToken()); + String responseJson = HttpUtil.createPost(url).header("Content-Type", "application/json") + .body(JSONUtil.toJsonStr(Map.of("env", ENV, "query", sql))).execute().body(); + JSONObject response = JSONUtil.parseObj(responseJson); + if (response.getInt("errcode") == 42001) { + redisService.del(RedisConstant.REDIS_KEY_WE_APP_ACCESS_TOKEN); +// request(crud, sql); + } else if (response.getInt("errcode") == 40001) { + redisService.del(RedisConstant.REDIS_KEY_WE_APP_ACCESS_TOKEN); + } else if (response.getInt("errcode") != 0) { + throw new RuntimeException("小程序云函数接口调用失败,errcode:" + response.getStr("errcode") + ",errmsg:" + response.getStr("errmsg")); + } + return response; + } + + /** + * 获取token + * + * @return + */ + private String getAccessToken() { + String token = redisService.get(RedisConstant.REDIS_KEY_WE_APP_ACCESS_TOKEN); + if (StrUtil.isNotBlank(token)) { + return token; + } + String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET".replace("APPID", APPID).replace("APPSECRET", APP_SECRET); + String responseJson = HttpUtil.createGet(url).execute().body(); + + TokenResponse tokenResponse = JSONUtil.toBean(responseJson, TokenResponse.class); + // 微信的Access_token，两个小时过期，也就是7200秒 + redisService.setex(RedisConstant.REDIS_KEY_WE_APP_ACCESS_TOKEN, 7000, tokenResponse.getAccess_token()); + return tokenResponse.getAccess_token(); + + /*String result = Http.get(url).getContent(); + HashMap tokenObject = Json.fromJson(HashMap.class, result); + if (tokenObject.containsKey("errcode")) { + log.error("获取token失败------" + tokenObject.get("errmsg")); + throw new RuntimeException("获取token失败------" + tokenObject.get("errmsg")); + } + redisService.setex(RedisConstant.REDIS_KEY_WE_APP_ACCESS_TOKEN, 7200 - 200, (String) tokenObject.get("access_token")); + return (String) tokenObject.get("access_token"); + return null;*/ + } + + @Getter + @AllArgsConstructor + public enum CRUD { + INSERT("https://api.weixin.qq.com/tcb/databaseadd?access_token=ACCESS_TOKEN"), + QUERY("https://api.weixin.qq.com/tcb/databasequery?access_token=ACCESS_TOKEN"), + DELETE("https://api.weixin.qq.com/tcb/databasedelete?access_token=ACCESS_TOKEN"), + UPDATE("https://api.weixin.qq.com/tcb/databaseupdate?access_token=ACCESS_TOKEN"), + AGGREGATE("https://api.weixin.qq.com/tcb/databaseaggregate?access_token=ACCESS_TOKEN"), + COUNT("https://api.weixin.qq.com/tcb/databasecount?access_token=ACCESS_TOKEN"); + private final String url; + } + + @Data + public static class Response { + private int errcode; + private String erremsg; + } + + @EqualsAndHashCode(callSuper = true) + @Data + public static class TokenResponse extends Response { + private int expires_in; + private String access_token; + } + + /** + * 上传文件返回cloud—url + * + * @param rootPath + * @param file + * @return + */ + public String uploadFile(String rootPath, File file) { + String path = rootPath + file.getName(); + String url = "https://api.weixin.qq.com/tcb/uploadfile?access_token=ACCESS_TOKEN".replace("ACCESS_TOKEN", getAccessToken()); + String responseJson = HttpUtil.createPost(url).header("Content-Type", "application/json") + .body(JSONUtil.toJsonStr(Map.of("env", ENV, "path", path))).execute().body(); + JSONObject jsonObject = JSONUtil.parseObj(responseJson); + if (jsonObject.getInt("errcode") != 0) { + throw new RuntimeException(jsonObject.getStr("errmsg")); + } + try{ + HttpUtil.createPost(jsonObject.getStr("url")) + .form("key", path) + .form("Signature", jsonObject.getStr("authorization")) + .form("x-cos-security-token", jsonObject.getStr("token")) + .form("x-cos-meta-fileid", jsonObject.getStr("cos_file_id")) + .form("file", file) + .execute().body(); + return jsonObject.getStr("file_id"); + }catch (Exception e){ + return jsonObject.getStr("file_id"); + } + } + + public String httpFile(String fileId) { + String url = "https://api.weixin.qq.com/tcb/batchdownloadfile?access_token=ACCESS_TOKEN".replace("ACCESS_TOKEN", getAccessToken()); + + HashMap body = new HashMap<>(2) {{ + put("env", ENV); + put("file_list", new ArrayList<>() {{ + add(new HashMap<>() {{ + put("fileid", fileId); + put("max_age", 7200); + }}); + }}); + }}; + + Map mf = new HashMap(); + mf.put("fileid", fileId); + mf.put("max_age", 7200); + ArrayList fm = new ArrayList<>(); + fm.add(mf); + + body.put("file_list", fm); + + + String responseJson = HttpUtil.createPost(url) + .header("Content-Type", "application/json") + .body(JSONUtil.toJsonStr(body)) + .execute().body(); + System.out.println(JSONUtil.toJsonStr(body)); + JSONObject jsonObject = JSONUtil.parseObj(responseJson); + if (jsonObject.getInt("errcode") != 0) { + throw new RuntimeException(jsonObject.getStr("errmsg")); + } + return jsonObject.getJSONArray("file_list").toList(JSONObject.class).get(0).getStr("download_url"); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/data/WorkersHomeDataRevelController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/data/WorkersHomeDataRevelController.java new file mode 100644 index 00000000..ddc7903a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/data/WorkersHomeDataRevelController.java @@ -0,0 +1,308 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.data; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_file; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeDataRevel; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +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.Criteria; +import org.nutz.dao.sql.Sql; +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.random.R; +import org.nutz.lang.util.NutMap; +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.io.FileInputStream; +import java.net.URLEncoder; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeDataRevelController + * @Date 2024/7/30 15:48 + * @注释 职工建家资料管理 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家资料管理") +@At("/platform/workershome/data/revel") +public class WorkersHomeDataRevelController { + + @Inject + private Dao dao; + @Inject + private FtpService ftpsService; + @Inject + private WorkersHomeInfoService workersHomeInfoService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/data/revel.html") + @SaCheckPermission("workershome.data.revel") + public void index() { + } + + + @At + @ApiOperation("获取职工小家的树形数据，按分工会展示") + @SaCheckPermission("workershome.data.revel") + public Result getTreeData(@Param("year") String year, + @Param("revelName") String revelName, + @Param("typeId") String typeId) { + NutMap nutMap = NutMap.NEW(); + nutMap.setv("unionname", "工会委员会"); + Sql sql = Sqls.create(""" + select + un.*, + un.name AS unionname, + (select count(*) from workers_home_data_revel whdr where whdr.belongToUnionId = un.id $revelCount) as revelCount + from + sys_union un + $condition + """); + Criteria criteria = Cnd.cri(); + criteria.where().setTop(false); + if (StringUtils.isNotBlank(year)) { + criteria.where().and("year(whdr.time)", "=", year); + } + if (StringUtils.isNotBlank(revelName)) { + criteria.where().and(Cnd.likeEX("whdr.revelName", revelName)); + } + if (StringUtils.isNotBlank(typeId)) { + criteria.where().and("whdr.typeId", "=", typeId); + } + if (!criteria.where().isEmpty()) { + sql.vars().set("revelCount", "and " + criteria.toSql(null)); + } + + Cnd cnd = Cnd.NEW(); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.and("un.id", "=", SecurityUtil.getUnionId()); + } + cnd.asc("un.unioncode"); + sql.setCondition(cnd); + nutMap.setv("child", workersHomeInfoService.listMap(sql)); + return Result.success().addData(List.of(nutMap)); + } + + + @At + @ApiOperation("按照工会查询职工小家资料列表") + @SaCheckPermission("workershome.data.revel") + public Object pageData(PageForm pageForm, + @Param("year") String year, + @Param("revelName") String revelName, + @Param("typeId") String typeId, + @Param("unionId") String unionId) { + try { + Sql sql = Sqls.create(""" + SELECT + whdr.*, + whdt.typeName + FROM + workers_home_data_revel whdr + LEFT JOIN workers_home_data_type whdt ON whdr.typeId = whdt.id + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("year(whdr.time)", "=", year); + if (StrUtil.isNotBlank(revelName)) { + cnd.and(Cnd.likeEX("whdr.revelName", revelName)); + } + cnd.andEX("whdr.typeId", "=", typeId); + cnd.andEX("whdr.unionId", "=", unionId); + cnd.desc("whdr.time"); + sql.setCondition(cnd); + Pagination pagination = workersHomeInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(); + } + } + + + @At + @ApiOperation("职工小家资料添加") + @SaCheckPermission("workershome.data.revel") + @SLog(tag = "职工小家资料添加", msg = "职工小家资料名称: ${args[0].revelName}") + public Result doAdd(WorkersHomeDataRevel workersHomeDataRevel) { + View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId())); + workersHomeDataRevel.setId(R.UU32()); + workersHomeDataRevel.setUserId(user.getId()); + workersHomeDataRevel.setUsername(user.getUsername()); + workersHomeDataRevel.setLoginName(user.getLoginname()); + workersHomeDataRevel.setUnitId(user.getUnitId()); + workersHomeDataRevel.setUnitName(user.getUnitName()); + workersHomeDataRevel.setUnionId(user.getUnionId()); + workersHomeDataRevel.setUnionName(user.getUnionName()); + workersHomeDataRevel.setTime(DateUtil.now()); + if (StrUtil.isNotBlank(workersHomeDataRevel.getBelongToUnionId())) { + Sys_union union = dao.fetch(Sys_union.class, workersHomeDataRevel.getBelongToUnionId()); + workersHomeDataRevel.setBelongToUnionName(union.getName()); + } else { + workersHomeDataRevel.setBelongToUnionId(user.getUnionId()); + workersHomeDataRevel.setBelongToUnionName(user.getUnionName()); + } + dao.fastInsert(workersHomeDataRevel); + return Result.success(); + } + + + @At + @ApiOperation("职工小家资料修改") + @SaCheckPermission("workershome.data.revel") + @SLog(tag = "职工小家资料修改", msg = "职工小家资料名称: ${args[0].revelName}") + public Result doEdit(WorkersHomeDataRevel workersHomeDataRevel) { + dao.update(workersHomeDataRevel); + return Result.success(); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工小家资料删除") + @SaCheckPermission("workershome.data.revel") + @SLog(tag = "职工小家资料删除", msg = "职工小家资料id: ${args[0]}") + public Result doDelete(String id) { + WorkersHomeDataRevel revel = dao.fetch(WorkersHomeDataRevel.class, id); + if (revel != null) { + if (revel.getFiles() != null && !revel.getFiles().isEmpty()) { + Set fileIds = revel.getFiles().stream().map(Sys_file::getId).collect(Collectors.toSet()); + dao.clear(Sys_file.class, Cnd.where("id", "in", fileIds)); + } + dao.clear(WorkersHomeDataRevel.class, Cnd.where("id", "=", id)); + } + return Result.success(); + } + + + @At + @Ok("void") + @ApiOperation("按工会导出所有资料") + @SaCheckPermission("workershome.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(WorkersHomeDataRevel.class, Cnd.where("belongToUnionId", "=", unionId)); + + try { + if (Lang.isNotEmpty(query)) { + for (WorkersHomeDataRevel revel : query) { + // 创建资料名称的文件夹 + String fileName = revel.getRevelName(); + + File tDir = new File(tmpDir + "/" + fileName); + tDir.mkdirs(); + +// if (Lang.isNotEmpty(revel.getFiles())) { +// for (Sys_file file : revel.getFiles()) { +// FileOutputStream outputStream = new FileOutputStream(tDir.getPath() + "/" + file.getFilename()); +// ftpsService.download(file.getFilepath(), outputStream); +// outputStream.close(); +// } +// } + } + + String aimsDir = "zipTmp/" + R.UU32(); + String aimsName = unionName + "附件汇总.zip"; + String aimsPath = aimsDir + "/" + aimsName; +// FileUtil.compressToZip(tmpDir.getPath(), aimsDir, aimsName); + + response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(aimsName, "UTF-8")); + + File aimsFile = new File(aimsPath); + FileInputStream inputStream = new FileInputStream(aimsFile); + IOUtils.copy(inputStream, response.getOutputStream()); + inputStream.close(); + aimsFile.delete(); + +// FileUtil.deleteDir(new File(tmpPath)); +// FileUtil.deleteDir(new File(aimsDir)); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + + + @At + @Ok("void") + @ApiOperation("导出单个资料") + @SaCheckPermission("workershome.data.revel") + public void exportAllFileById(String id, HttpServletResponse response) { + response.reset(); + response.setContentType("application/x-msdownload;charset=utf-8"); + + WorkersHomeDataRevel dataRevel = dao.fetch(WorkersHomeDataRevel.class, Cnd.where("id", "=", id)); + + // 创建临时文件夹 + String tmpPath = "tmp/" + R.UU32(); + File tmpDir = new File(tmpPath + "/" + dataRevel.getBelongToUnionName() + dataRevel.getRevelName() + "附件汇总"); + tmpDir.mkdirs(); + + try { + + if (Lang.isNotEmpty(dataRevel.getFiles())) { +// for (Sys_file file : dataRevel.getFiles()) { +// FileOutputStream outputStream = new FileOutputStream(tmpDir.getPath() + "/" + file.getFilename()); +// ftpsService.download(file.getFilepath(), outputStream); +// outputStream.close(); +// } + } + + String aimsDir = "zipTmp/" + R.UU32(); + String aimsName = dataRevel.getBelongToUnionName() + dataRevel.getRevelName() + "附件汇总.zip"; + String aimsPath = aimsDir + "/" + aimsName; +// FileUtil.compressToZip(tmpDir.getPath(), aimsDir, aimsName); + + response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(aimsName, "UTF-8")); + + File aimsFile = new File(aimsPath); + FileInputStream inputStream = new FileInputStream(aimsFile); + IOUtils.copy(inputStream, response.getOutputStream()); + inputStream.close(); + aimsFile.delete(); + +// FileUtil.deleteDir(new File(tmpPath)); +// FileUtil.deleteDir(new File(aimsDir)); + + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/data/WorkersHomeDataTypeController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/data/WorkersHomeDataTypeController.java new file mode 100644 index 00000000..d7ac58ea --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/data/WorkersHomeDataTypeController.java @@ -0,0 +1,134 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.data; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeDataType; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.random.R; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeDataTypeController + * @Date 2024/7/30 15:48 + * @注释 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家资料类型管理") +@At("/platform/workershome/data/type") +public class WorkersHomeDataTypeController { + + @Inject + private WorkersHomeInfoService workersHomeInfoService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/data/type.html") + @SaCheckPermission("workershome.data.type") + public void index() { + } + + + @At + @ApiOperation("资料类型数据展示") + @SaCheckPermission("workershome.data.type") + public Result pageData(PageForm pageForm, + @Param("typeName") String typeName) { + Sql sql = Sqls.create("select * from workers_home_data_type $condition"); + Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(typeName)) { + cnd.and(Cnd.likeEX("typeName", typeName)); + } + cnd.asc("serialNum"); + sql.setCondition(cnd); + Pagination pagination = workersHomeInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("新增资料类型") + @SaCheckPermission("workershome.data.type") + @SLog(tag = "职工小家资料类型添加", msg = "职工小家资料类型名称: ${args[0].typeName}") + public Result doAdd(WorkersHomeDataType workersHomeDataType) { + int count = workersHomeInfoService.dao().count("workers_home_data_type", Cnd.where("code", "=", workersHomeDataType.getCode())); + if (count > 0) { + return Result.error("编码重复"); + } + workersHomeDataType.setId(R.UU32()); + int totalCount = workersHomeInfoService.count("workers_home_data_type"); + workersHomeDataType.setSerialNum(totalCount + 1); + workersHomeInfoService.insert("workers_home_data_type", Chain.from(workersHomeDataType)); + return Result.success(); + } + + + @At + @ApiOperation("修改资料类型") + @SaCheckPermission("workershome.data.type") + @SLog(tag = "职工小家资料类型修改", msg = "职工小家资料类型名称: ${args[0].typeName}") + public Result doEdit(WorkersHomeDataType workersHomeDataType) { + int count = workersHomeInfoService.count("workers_home_data_type", Cnd.where("code", "=", workersHomeDataType.getCode()).and("id", "!=", workersHomeDataType.getId())); + if (count > 0) { + return Result.error("编码重复"); + } + workersHomeInfoService.update("workers_home_data_type", Chain.from(workersHomeDataType), Cnd.where("id", "=", workersHomeDataType.getId())); + return Result.success(); + } + + @At + @ApiOperation("删除资料类型") + @SaCheckPermission("workershome.data.type") + @SLog(tag = "职工小家资料类型删除", msg = "职工小家资料类型id: ${args[0]}") + public Result doDelete(String id) { + workersHomeInfoService.dao().clear(WorkersHomeDataType.class, Cnd.where("id", "=", id)); + return Result.success(); + } + + + @At + @ApiOperation("获取所有资料类型") + @SaCheckPermission("workershome.data.type") + public Result getAllWakesHomeDataType() { + List list = workersHomeInfoService.dao().query(WorkersHomeDataType.class, Cnd.NEW().asc("serialNum")); + return Result.success().addData(list); + } + + + @At + @ApiOperation("资料类型排序") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("workershome.data.type") + public Result serialNumChange(String id, Integer serialNum, boolean toDown) { + if (toDown) { + WorkersHomeDataType next = workersHomeInfoService.dao().fetch(WorkersHomeDataType.class, Cnd.where("serialNum", "=", serialNum + 1)); + next.setSerialNum(serialNum - 1); + workersHomeInfoService.dao().update(next); + workersHomeInfoService.dao().update(WorkersHomeDataType.class, Chain.make("serialNum", serialNum + 1), Cnd.where("id", "=", id)); + } else { + WorkersHomeDataType pre = workersHomeInfoService.dao().fetch(WorkersHomeDataType.class, Cnd.where("serialNum", "=", serialNum - 1)); + pre.setSerialNum(serialNum + 1); + workersHomeInfoService.dao().update(pre); + workersHomeInfoService.dao().update(WorkersHomeDataType.class, Chain.make("serialNum", serialNum - 1), Cnd.where("id", "=", id)); + } + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationApplyController.java new file mode 100644 index 00000000..3be4a9de --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationApplyController.java @@ -0,0 +1,93 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.declaration; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeApplyService; +import io.swagger.annotations.ApiOperation; +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; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeDeclarationApplyController + * @Date 2024/7/30 14:06 + * @注释 职工建家申报 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家申报") +@At("/platform/workershome/declaration/apply") +public class WorkersHomeDeclarationApplyController { + + @Inject + private WorkersHomeApplyService workersHomeApplyService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/declaration/apply.html") + @SaCheckPermission("workershome.declaration.apply") + public void index() {} + + + @At + @ApiOperation("职工建家申报保存") + @SLog(tag = "职工建家申报保存", msg = "职工建家申报信息") + @SaCheckPermission("workershome.declaration.apply") + public Result doSave(WorkersHomeApply workersHomeApply) { + workersHomeApply.setState("10000"); + if (StrUtil.isNotBlank(workersHomeApply.getId())) { + workersHomeApplyService.update(workersHomeApply); + } else { + workersHomeApplyService.setParams(workersHomeApply); + workersHomeApplyService.fastInsert(workersHomeApply); + } + return Result.success(); + } + + + @At + @ApiOperation("职工建家申报提交") + @SLog(tag = "职工建家申报提交", msg = "职工建家申报信息") + @SaCheckPermission("workershome.declaration.apply") + public Result doSubmit(WorkersHomeApply workersHomeApply) { + workersHomeApply.setState("10020"); + if (StrUtil.isNotBlank(workersHomeApply.getId())) { + workersHomeApplyService.update(workersHomeApply); + } else { + workersHomeApply.setId(R.UU32()); + workersHomeApplyService.setParams(workersHomeApply); + workersHomeApplyService.fastInsert(workersHomeApply); + } + return Result.success(); + } + + + @At + @ApiOperation("职工建家申报信息查询") + @SaCheckPermission(value = {"workershome.declaration.apply","workershome.declaration.mine", + "workershome.declaration.organization", "workershome.declaration.school", + "workershome.declaration.statistics"}, mode = SaMode.OR) + public Result getInfoById(String id){ + NutMap map = workersHomeApplyService.findById(id); + return Result.success().addData(map); + } + + + @At + @ApiOperation("职工建家申报工会信息查询") + @SaCheckPermission("workershome.declaration.apply") + public Result getWakesHomeUnitInfo() { + WorkersHomeApply apply = workersHomeApplyService.fetch(Cnd.where("unionId", "=", SecurityUtil.getUnionId())); + return Result.success().addData(apply); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationMineController.java new file mode 100644 index 00000000..40f1dada --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationMineController.java @@ -0,0 +1,147 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.declaration; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.model.Audit; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeApplyService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.servlet.http.HttpServletResponse; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeDeclarationMineController + * @Date 2024/7/30 14:06 + * @注释 我的建家申报 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家我的申报") +@At("/platform/workershome/declaration/mine") +public class WorkersHomeDeclarationMineController { + + @Inject + private WorkersHomeApplyService workersHomeApplyService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/declaration/mine.html") + @SaCheckPermission("workershome.declaration.mine") + public void index() { + } + + + @At + @ApiOperation("获取职工建家我的申报列表") + @SaCheckPermission("workershome.declaration.mine") + public Result pageData(PageForm pageForm, + @Param("year") Integer year, + @Param("unionId") String unionId) { + Sql sql = Sqls.create(""" + SELECT + wh.*, + audit.stateName + FROM + `workers_home_apply` wh + LEFT JOIN audit_state audit ON wh.state = audit.stateId + AND audit.module = 'workershome' + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(wh.applyDate)", "=", year); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.and("unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.andEX("unionId", "=", unionId); + } + sql.setCondition(cnd); + Pagination pagination = workersHomeApplyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工建家我的申报删除") + @SLog(tag = "职工建家我的申报删除", msg = "职工建家我的申报id: ${args[0]}") + @SaCheckPermission(value = {"workershome.declaration.apply", "workershome.declaration.mine"}, mode = SaMode.OR) + public Result doDelete(String id) { + WorkersHomeApply apply = workersHomeApplyService.fetch(id); + if (StrUtil.isNotBlank(apply.getOrganizationAuditId())) { + workersHomeApplyService.dao().delete(Audit.class, apply.getOrganizationAuditId()); + } + if (StrUtil.isNotBlank(apply.getSchoolAuditId())) { + workersHomeApplyService.dao().delete(Audit.class, apply.getSchoolAuditId()); + } + workersHomeApplyService.delete(id); + return Result.success(); + } + + @At + @Ok("void") + public void openExport(String id, HttpServletResponse response) { +// try { +// NutMap nutMap = workersHomeApplyService.findById(id); +// +// HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); +// HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy(); +// htmlRenderPolicy.getConfig().setShowDefaultTableBorderInTableCell(true); +// +// Configure config = Configure.newBuilder() +// .bind("basicInformation", htmlRenderPolicy) +// .bind("constructionPlan", htmlRenderPolicy).build(); +// HashMap map = new HashMap<>(); +// String fileName = Globals.schoolName + "“教工小家”建设计划书"; +// map.put("fileName", fileName); +// map.put("schoolName", Globals.schoolName); +// map.put("unionName", nutMap.getString("unionName")); +// map.put("applyDate", nutMap.getString("applyDate")); +// map.put("username", nutMap.getString("username")); +// map.put("mobile", nutMap.getString("mobile")); +// map.put("basicInformation", nutMap.getString("basicInformation")); +// map.put("constructionPlan", nutMap.getString("constructionPlan")); +// NutMap schoolAudit = nutMap.getAs("schoolAudit", NutMap.class); +// if (Lang.isNotEmpty(schoolAudit)){ +// schoolAudit.setv("auditTime", DateUtil.formatDate(schoolAudit.getTime("auditTime"))); +// schoolAudit.setv("auditSign", Vi.getImg(schoolAudit.getString("auditSign"))); +// map.put("schoolAudit", schoolAudit); +// } +// NutMap organizationAudit = nutMap.getAs("organizationAudit", NutMap.class); +// if (Lang.isNotEmpty(organizationAudit)){ +// organizationAudit.setv("auditTime", DateUtil.formatDate(organizationAudit.getTime("auditTime"))); +// organizationAudit.setv("auditSign", Vi.getImg(organizationAudit.getString("auditSign"))); +// map.put("organizationAudit", organizationAudit); +// } +// +// +// +// +// response.addHeader("Content-Type", "application/octet-stream"); +// response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes("UTF-8"), "ISO-8859-1") + "\".docx"); +// InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/workershome/workershome.docx"); +// XWPFTemplate.compile(inputStream, config).render(map, response.getOutputStream()); +// inputStream.close(); +// } catch (Exception e) { +// e.printStackTrace(); +// } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationOrganizationController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationOrganizationController.java new file mode 100644 index 00000000..b6f08ca7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationOrganizationController.java @@ -0,0 +1,100 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.declaration; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.model.Audit; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeApplyService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +/** + * @version 1.0 + * @Author zzr + * @name：WakesHomeDeclarationOrganization + * @Date 2024/7/30 14:07 + * @注释 建家申报党组织审核 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家申报党组织审核") +@At("/platform/workershome/declaration/organization") +public class WorkersHomeDeclarationOrganizationController { + + @Inject + private WorkersHomeApplyService workersHomeApplyService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html") + @SaCheckPermission("workershome.declaration.organization") + public void index() { + } + + + @At + @ApiOperation("职工建家申报党组织审核") + @SaCheckPermission("workershome.declaration.organization") + public Result pageData(PageForm pageForm, @Param("year") Integer year, + @Param("unionId") String unionId, @Param("isAudit") String isAudit) { + Sql sql = Sqls.create(""" + SELECT + wh.*, + audit.stateName + FROM + `workers_home_apply` wh + LEFT JOIN audit_state audit ON wh.state = audit.stateId + AND audit.module = 'workershome' + $condition + """); + Cnd cnd = Cnd.NEW(); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.and("wh.unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.andEX("wh.unionId", "=", unionId); + } + cnd.andEX("YEAR(wh.applyDate)", "=", year); + cnd.and("wh.state", "true".equals(isAudit) ? ">" : "false".equals(isAudit) ? "=" : ">=", 10010); + sql.setCondition(cnd); + Pagination pagination = workersHomeApplyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工建家申报党组织审核") + @SaCheckPermission("workershome.declaration.organization") + public Result doAudit(@Param("audit") Audit audit, String id) { + Boolean auditPass = audit.getAuditPass(); + workersHomeApplyService.dao().insert(audit); + workersHomeApplyService.update(Chain.make("state", auditPass ? 10020 : 10015) + .add("organizationAuditId", audit.getId()), Cnd.where("id", "=", id)); + return Result.success(); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("workershome.declaration.organization") + public Result doRollBack(String id){ + WorkersHomeApply workershome = workersHomeApplyService.fetch(id); + workersHomeApplyService.dao().clear(Audit.class,Cnd.where("id","=",workershome.getOrganizationAuditId())); + workersHomeApplyService.update(Chain.make("state",10010).add("organizationAuditId",null),Cnd.where("id","=",id)); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationSchoolController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationSchoolController.java new file mode 100644 index 00000000..b04342da --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationSchoolController.java @@ -0,0 +1,119 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.declaration; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.model.Audit; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeApplyService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeDeclarationSchoolController + * @Date 2024/7/30 14:07 + * @注释 建家申报校工会审核 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家校工会审核") +@At("/platform/workershome/declaration/school") +public class WorkersHomeDeclarationSchoolController { + + @Inject + private WorkersHomeApplyService workersHomeApplyService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html") + @SaCheckPermission("workershome.declaration.school") + public void index() { + } + + + @At + @ApiOperation("获取职工建家校工会审核列表") + @SaCheckPermission("workershome.declaration.school") + public Result pageData(PageForm pageForm, + @Param("year") Integer year, + @Param("unionId") String unionId, + @Param("isAudit") String isAudit) { + Sql sql = Sqls.create(""" + SELECT + wh.*, + audit.stateName + FROM + `workers_home_apply` wh + LEFT JOIN audit_state audit ON wh.state = audit.stateId + AND audit.module = 'workershome' + $condition + """); + Cnd cnd = Cnd.NEW(); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.and("wh.unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.andEX("wh.unionId", "=", unionId); + } + cnd.andEX("YEAR(wh.applyDate)", "=", year); + cnd.and("wh.state", "true".equals(isAudit) ? ">" : "false".equals(isAudit) ? "=" : ">=", 10020); + sql.setCondition(cnd); + Pagination pagination = workersHomeApplyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工建家校工会审核") + @SaCheckPermission("workershome.declaration.school") + @SLog(tag = "职工建家校工会审核", msg = "职工建家校工会审核id: ${args[1]}") + public Result doAudit(@Param("audit") Audit audit, String id) { + Boolean auditPass = audit.getAuditPass(); + workersHomeApplyService.dao().insert(audit); + workersHomeApplyService.update(Chain.make("state", auditPass ? 10030 : 10025) + .add("schoolAuditId", audit.getId()), Cnd.where("id", "=", id)); + return Result.success(); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工建家校工会审核撤回") + @SaCheckPermission("workershome.declaration.school") + @SLog(tag = "职工建家校工会审核撤回", msg = "职工建家校工会审核撤回id: ${args[0]}") + public Result doRollBack(String id) { + WorkersHomeApply workersHome = workersHomeApplyService.fetch(id); + workersHomeApplyService.dao().clear(Audit.class, Cnd.where("id", "=", workersHome.getSchoolAuditId())); + workersHomeApplyService.update(Chain.make("state", 10020).add("schoolAuditId", null), Cnd.where("id", "=", id)); + return Result.success(); + } + + @At + @ApiOperation("职工建家校工会审核文件上传") + @SaCheckPermission("workershome.declaration.school") + public Result doFiles(String id, String files) { + WorkersHomeApply wakesHomeApply = new WorkersHomeApply(); + wakesHomeApply.setId(id); + wakesHomeApply.setFiles(JSONUtil.toList(files, JSONObject.class)); + workersHomeApplyService.updateIgnoreNull(wakesHomeApply); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationStatisticsController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationStatisticsController.java new file mode 100644 index 00000000..1531d6c9 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/declaration/WorkersHomeDeclarationStatisticsController.java @@ -0,0 +1,71 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.declaration; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeApplyService; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeDeclarationStatisticsController + * @Date 2024/8/2 15:00 + * @注释 申报，查询统计 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工建家统计") +@At("/platform/workershome/declaration/statistics") +public class WorkersHomeDeclarationStatisticsController { + + @Inject + private WorkersHomeApplyService workersHomeApplyService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/declaration/statistics.html") + @SaCheckPermission("workershome.declaration.statistics") + public void index() {} + + + @At + @ApiOperation("获取职工建家统计列表") + @SaCheckPermission("workershome.declaration.statistics") + public Result pageData(PageForm pageForm, + @Param("year") Integer year, + @Param("unionId") String unionId){ + Sql sql = Sqls.create(""" + SELECT + wh.*, + audit.stateName + FROM + `workers_home_apply` wh + LEFT JOIN audit_state audit ON wh.state = audit.stateId + AND audit.module = 'workershome' + $condition + """); + Cnd cnd = Cnd.NEW(); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.and("wh.unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.andEX("wh.unionId", "=", unionId); + } + cnd.andEX("YEAR(wh.applyDate)", "=", year); + cnd.and("wh.state", "=" , 10030); + sql.setCondition(cnd); + Pagination pagination = workersHomeApplyService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeApplyController.java new file mode 100644 index 00000000..b1fa5e09 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeApplyController.java @@ -0,0 +1,66 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.info; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHome; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +@IocBean +@Ok("json:full") +@ApiOperation("职工建家信息填报") +@At("/platform/workershome/info/apply") +public class WorkersHomeApplyController { + + @Inject + private WorkersHomeInfoService workersHomeInfoService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/info/apply.html") + @SaCheckPermission("workershome.info.apply") + public void index() {} + + + @At + @SaCheckPermission("workershome.info.apply") + public Result doAdd(WorkersHome workershome, Boolean isSubmit){ + if (isSubmit){ + workershome.setState(8120); + } else { + workershome.setState(8100); + } + if (!"校工会".equals(workershome.getCategory())){ + workershome.setUnionId(SecurityUtil.getUnionId()); + } + workersHomeInfoService.insert(workershome); + return Result.success(); + } + + + @At + @SaCheckPermission("workershome.info.apply") + public Result doEdit(WorkersHome workershome,Boolean isSubmit){ + if (isSubmit){ + workershome.setState(8120); + } + workersHomeInfoService.updateIgnoreNull(workershome); + return Result.success(); + } + + + @At + @SaCheckPermission("workershome.info.apply") + public Result validateApply(){ + int count = workersHomeInfoService.dao().count(WorkersHomeApply.class, + Cnd.where("state", "=", "10030") + .and("unionId", "=", SecurityUtil.getUnionId())); + return (count > 0) ? Result.success() : Result.error(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeInfoController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeInfoController.java new file mode 100644 index 00000000..07ef4d31 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeInfoController.java @@ -0,0 +1,60 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.info; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; + +@IocBean +@Ok("json:full") +@ApiOperation("职工建家信息查询") +@At("/platform/workershome/info/info") +public class WorkersHomeInfoController { + + @Inject + private WorkersHomeInfoService workersHomeInfoService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/info/info.html") + @SaCheckPermission("workershome.info.info") + public void index() {} + + + @At + @ApiOperation("职工建家信息查询") + @SaCheckPermission("workershome.info.info") + public Result pageData(PageForm pageForm, @Param("year") Integer year, @Param("unionId") String unionId){ + Sql sql = Sqls.create(""" + SELECT + wh.* + FROM + `workers_home` wh + LEFT JOIN sys_union su ON su.id = wh.unionId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(applyTime)","=",year); + if ("校工会".equals(unionId)){ + cnd.and("wh.category","=","校工会"); + } else { + cnd.andEX("wh.unionId","=",unionId); + } + cnd.and("wh.state","=",8130); + cnd.asc("su.unioncode"); + sql.setCondition(cnd); + List list = workersHomeInfoService.listMap(sql); + return Result.success().addData(list); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeMineController.java new file mode 100644 index 00000000..dc1a30c7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeMineController.java @@ -0,0 +1,97 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.info; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.model.Audit; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHome; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + + +@IocBean +@Ok("json:full") +@ApiOperation("职工建家信息我的填报") +@At("/platform/workershome/info/mine") +public class WorkersHomeMineController { + + @Inject + private WorkersHomeInfoService workersHomeInfoService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/info/mine.html") + @SaCheckPermission("workershome.info.mine") + public void index() {} + + + @At + @ApiOperation("职工建家信息我的填报列表") + @SaCheckPermission("workershome.info.mine") + public Result pageData(PageForm pageForm, @Param("year") Integer year, @Param("unionId")String unionId){ + Sql sql = Sqls.create(""" + SELECT + wh.*, + audit.stateName + FROM + `workers_home` wh + LEFT JOIN audit_state audit ON wh.state = audit.stateId + AND audit.module = 'workershome' + $condition + """); + + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(applyTime)","=",year); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){ + cnd.and("unionId","=", SecurityUtil.getUnionId()); + } else { + if ("校工会".equals(unionId)){ + cnd.and("wh.category","=","校工会"); + } else { + cnd.andEX("unionId", "=", unionId); + } + } + sql.setCondition(cnd); + Pagination pagination = workersHomeInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + + + @At + @ApiOperation("职工建家信息我的填报详情") + @SaCheckPermission(value = {"workershome.info.mine","workershome.info.apply"}, mode = SaMode.OR) + public Result getInfoById(String id){ + WorkersHome workersHome = workersHomeInfoService.fetch(id); + NutMap nutMap = Lang.obj2nutmap(workersHome); + Audit audit = workersHomeInfoService.dao().fetch(Audit.class, Cnd.where("id", "=", workersHome.getSchoolAuditId())); + if (Lang.isNotEmpty(audit)){ + nutMap.setv("schoolAudit",audit); + } + return Result.success().addData(nutMap); + } + + @At + @ApiOperation("职工建家信息我的填报删除") + @SaCheckPermission("workershome.info.mine") + @SLog(tag = "职工建家信息", msg = "职工建家信息删除id: ${args[0]}") + public Result doRemove(String id){ + workersHomeInfoService.delete(id); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeSchoolAuditController.java new file mode 100644 index 00000000..7f27b5e4 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/info/WorkersHomeSchoolAuditController.java @@ -0,0 +1,102 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.info; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.model.Audit; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHome; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + + +@IocBean +@Ok("json:full") +@ApiOperation("职工建家信息校工会审核") +@At("/platform/workershome/info/schoolaudit") +public class WorkersHomeSchoolAuditController { + + @Inject + private WorkersHomeInfoService workersHomeInfoService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/info/schoolAudit.html") + @SaCheckPermission("workershome.info.schoolaudit") + public void index() {} + + + @At + @ApiOperation("职工建家信息校工会审核列表") + @SaCheckPermission("workershome.info.schoolaudit") + public Result pageData(PageForm pageForm, @Param("year") Integer year, + @Param("unionId")String unionId, @Param("isAudit") String isAudit){ + Sql sql = Sqls.create(""" + SELECT + wh.*, + audit.stateName + FROM + `workers_home` wh + LEFT JOIN audit_state audit ON wh.state = audit.stateId + AND audit.module = 'workershome' + $condition + """); + + Cnd cnd = Cnd.NEW(); + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){ + cnd.and("unionId", "=" , SecurityUtil.getUnionId()); + } else { + if ("校工会".equals(unionId)){ + cnd.and("wh.category","=","校工会"); + } else { + cnd.andEX("unionId", "=", unionId); + } + } + cnd.andEX("YEAR(applyTime)","=",year); + cnd.and("wh.state", "true".equals(isAudit) ? ">" : "false".equals(isAudit) ? "=" : ">=", 8120); + sql.setCondition(cnd); + Pagination pagination = workersHomeInfoService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工建家信息校工会审核") + @SaCheckPermission("workershome.info.schoolaudit") + @SLog(tag = "职工建家信息校工会审核", msg = "职工建家信息校工会审核id: ${args[1]}") + public Result doAudit(@Param("audit") Audit audit, String id, String isPass){ + workersHomeInfoService.dao().insert(audit); + workersHomeInfoService.update(Chain.make("state","1".equals(isPass) ? 8130 : 8125) + .add("schoolAuditId",audit.getId()), Cnd.where("id","=",id)); + return Result.success(); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("职工建家信息校工会审核撤回") + @SaCheckPermission("workershome.info.schoolaudit") + @SLog(tag = "职工建家信息校工会审核撤回", msg = "职工建家信息校工会审核撤回id: ${args[0]}") + public Object doRollBack(String id){ + WorkersHome workersHome = workersHomeInfoService.fetch(id); + workersHomeInfoService.dao().clear(Audit.class,Cnd.where("id","=",workersHome.getSchoolAuditId())); + workersHomeInfoService.update(Chain.make("state",8120).add("schoolAuditId",null),Cnd.where("id","=",id)); + return null; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewController.java new file mode 100644 index 00000000..b26bf0d7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewController.java @@ -0,0 +1,115 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.review; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeReviewController + * @Date 2024/8/1 16:47 + * @注释 pc端职工评议 + */ +@IocBean +@Ok("json:full") +@ApiOperation("电脑端的职工评议") +@At("/platform/workershome/review/doReview") +public class WorkersHomeReviewController { + + @Inject + private CommentZbService commentZbService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/review/doReview.html") + @SaCheckPermission("workershome.review.doReview") + public void index() { + } + + @At + @ApiOperation("职工评议分页数据") + @SaCheckPermission("workershome.review.doReview") + public Result pageData(PageForm pageForm, + @Param("annual") String annual, + @Param("assessment") String assessment){ + Sql sql = Sqls.create(""" + SELECT + zb.* , + if((select count(1) from comment_peo peo where peo.zbId = zb.id and peo.userId = @userId) > 0,true,false) as isReview + FROM + `comment_zb` zb + $condition + """).setParam("userId", SecurityUtil.getUserId()); + Cnd cnd = Cnd.NEW(); + if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) { + cnd.and("zb.annual", "=", annual); + } + if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) { + cnd.where().andLike("zb.assessment", assessment); + } else { + cnd.desc("zb.annual"); + } + sql.setCondition(cnd); + Pagination pagination = commentZbService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + List list = pagination.getList(); + List unionList = commentZbService.dao().query(Sys_union.class, Cnd.NEW()); + list.forEach(v -> { + //自评模式 + boolean reviewMode = v.getInt("reviewMode") == 1; + if (reviewMode && v.getInt("commentTarget") == 1) { + //校工会自评，判断有没有校工会管理员的权限 + v.put("canJoin", AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())); + } else if (reviewMode && v.getInt("commentTarget") == 2){ + //分工会自评，判断有没有分工会管理员 + v.put("canJoin", AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())); + } + + //自选分工会的模式 + if (StrUtil.isNotBlank(v.getString("unionIds"))) { + List unionIdList = JSONUtil.parseArray(v.getString("unionIds")).toList(String.class); + String string = unionList.stream().filter(item -> unionIdList.contains(item.getId())) + .map(Sys_union::getName).collect(Collectors.joining(",")); + v.put("unionNames", string); + //如果是自评，只有分工会主席才能自评 + if (reviewMode) { + v.put("canJoin", (unionIdList.contains(SecurityUtil.getUnionId()) && AuthUtil.hasRole(RoleConstant.BRANCH_UNION_ADMIN.name()))); + } else { + v.put("canJoin", unionIdList.contains(SecurityUtil.getUnionId())); + } + } + }); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("判断当前用户是否已经评价") + @SaCheckPermission("workershome.review.doReview") + public Object getPeoId(String id){ + WorkersHomeReviewPeo peo = commentZbService.dao().fetch(WorkersHomeReviewPeo.class, Cnd.where("zbId", "=", id).and("userId", "=", SecurityUtil.getUserId())); + return Result.success().addData(peo.getId()); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewExportController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewExportController.java new file mode 100644 index 00000000..1e852ee2 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewExportController.java @@ -0,0 +1,267 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.review; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ZipUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewExport; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.util.IOUtils; +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.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @ClassName exportZpController + * @Description TODO + * @Author zhf + * @Date 2023/9/6 17:09 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工评议-导出") +@At("/platform/workershome/review/export") +public class WorkersHomeReviewExportController { + + +// @Inject +// private OfficeTemplateUtil officeTemplateUtil; + + @Inject + private Dao dao; + @Inject + private CommentZbService zbService; + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/unionComment/exportZp.html") + @SaCheckPermission("workerhome.review.export") + public void index() {} + + + @At + @ApiOperation("获取列表") + @SaCheckPermission("workerhome.review.export") + public Result pageData(@Param("annual") Integer annual, + int pageNumber, int pageSize) { + Sql sql = Sqls.create("SELECT YEAR(e.createTime) annual,e.* FROM `comment_export` e $condition"); + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(e.createTime)", "=", annual); + sql.setCondition(cnd); + Pagination pagination = zbService.listPageMap(pageNumber, pageSize, sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("获取指标列表") + @SaCheckPermission("workerhome.review.export") + public Result getZbData(@Param("annual") String annual, @Param("assessment") String assessment) { + Sql sql = Sqls.create("SELECT * FROM `comment_zb` $condition"); + Cnd cnd = Cnd.NEW(); + if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) { + cnd.and("annual", "=", annual); + } + if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) { + cnd.where().andLike("assessment", assessment); + } else { + cnd.desc("annual"); + } + sql.setCondition(cnd); + List list = zbService.listMap(sql); + return Result.success().addData(list); + } + + @At + @ApiOperation("添加导出内容") + @SaCheckPermission("workerhome.review.export") + public Result doAddExport(@Param("export") WorkersHomeReviewExport export) { + export.setCreateTime(DateUtil.now()); + if (StrUtil.isNotBlank(export.getId())) { + zbService.updateIgnoreNull(export); + } else { + zbService.insert(export); + } + return null; + } + + @At + @ApiOperation("删除导出内容") + @SaCheckPermission("workerhome.review.export") + @SLog(tag = "删除导出内容", msg = "删除到处内容id: ${args[0]}") + public Result doDelete(String id) { + zbService.dao().delete(WorkersHomeReviewExport.class, id); + return Result.success(); + } + + @At + @ApiOperation("获取导出内容") + @SaCheckPermission("workerhome.review.export") + public Result findOne(String id) { + WorkersHomeReviewExport export = zbService.dao().fetch(WorkersHomeReviewExport.class, id); + List zbList = zbService.query(Cnd.NEW().and("id", "in", export.getProxyIds()).asc("assessmentMode")); + Map data = Map.of("export", export, "zbList", zbList); + return Result.success().addData(data); + } + + + @At + @Ok("void") + @ApiOperation("导出") + @SaCheckPermission("workerhome.review.export") + public void doExport(String id, HttpServletResponse response) throws Exception { + WorkersHomeReviewExport export = zbService.dao().fetch(WorkersHomeReviewExport.class, id); + //查询测评有那几个工会测评过 + Sql sql = Sqls.create(""" + SELECT + un.id, + un.unionname unionName, + count( peo.id ) num + FROM + sys_union un + LEFT JOIN `user` u ON u.unionId = un.id + LEFT JOIN comment_peo peo ON peo.userId = u.id + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("peo.zbId", "in", export.getProxyIds()); + cnd.groupBy("un.id"); + cnd.desc("count( peo.id )"); + sql.setCondition(cnd); + List unionMap = zbService.listMap(sql); + + + List zbs = zbService.query(Cnd.NEW().and("id", "in", export.getProxyIds()).asc("assessmentMode")); + + //创建临时文件夹 + Path templateDir = Files.createTempDirectory("评测结果文件夹"); + + //循环分工会 + for (NutMap un : unionMap) { + List users = zbService.dao().query(View_user.class, Cnd.where("unionId", "=", un.getString("id"))); + + FileOutputStream outputStream = new FileOutputStream(templateDir.toString() + "/" + un.getString("unionName") + "基层工会会员评家民主测评结果报告表.docx"); + + List zpxxList = new ArrayList<>(); + for (WorkersHomeReviewProxy zb : zbs) { + + Sql sqlps = Sqls.create(""" + SELECT + SUM( CASE WHEN cp.reviewResult = '不满意' THEN 1 ELSE 0 END ) AS bmy, + SUM( CASE WHEN cp.reviewResult = '基本满意' THEN 1 ELSE 0 END ) AS jbmy, + SUM( CASE WHEN cp.reviewResult = '满意' THEN 1 ELSE 0 END ) AS my + FROM + comment_peo cp + LEFT JOIN `user` u ON u.id = cp.userId + $condition + """); + Cnd cndPs = Cnd.NEW(); + cndPs.and("u.unionId", "=", un.getString("id")); + cndPs.and("cp.zbId", "=", zb.getId()); + + sqlps.setCondition(cndPs); + if (zb.getAssessmentMode() == 1) { + NutMap zpxx = new NutMap(); + + sqlps.setCallback(Sqls.callback.map()); + dao.execute(sqlps); + NutMap psMap = (NutMap) sqlps.getResult(); + zpxx.setv("pcdx", "工会工作及职工之家建设情况测评"); + zpxx.setv("my", psMap.getInt("my")); + zpxx.setv("jbmy", psMap.getInt("jbmy")); + zpxx.setv("bmy", psMap.getInt("bmy")); + zpxxList.add(zpxx); + } else { + NutMap zpxxZx = new NutMap(); + Cnd clone = cndPs.clone(); + sqlps.setCondition(clone); + clone.and("cp.evaluatedPersonType", "=", "分工会主席"); + + sqlps.setCallback(Sqls.callback.map()); + dao.execute(sqlps); + NutMap psMap = (NutMap) sqlps.getResult(); + zpxxZx.setv("pcdx", "工会主席履职情况测评"); + zpxxZx.setv("my", psMap.getInt("my")); + zpxxZx.setv("jbmy", psMap.getInt("jbmy")); + zpxxZx.setv("bmy", psMap.getInt("bmy")); + zpxxList.add(zpxxZx); + + + NutMap zpxxFzx = new NutMap(); + Cnd clone2 = cndPs.clone(); + clone2.and("cp.evaluatedPersonType", "=", "分工会副主席"); + sqlps.setCondition(clone2); + + sqlps.setCallback(Sqls.callback.map()); + dao.execute(sqlps); + NutMap psMap2 = (NutMap) sqlps.getResult(); + zpxxFzx.setv("pcdx", "工会副主席履职情况测评"); + zpxxFzx.setv("my", psMap2.getInt("my")); + zpxxFzx.setv("jbmy", psMap2.getInt("jbmy")); + zpxxFzx.setv("bmy", psMap2.getInt("bmy")); + zpxxList.add(zpxxFzx); + } + + + } +// HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); +// HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy(); +// htmlRenderPolicy.getConfig().setShowDefaultTableBorderInTableCell(true); +// +// Configure config = Configure.newBuilder().bind("zpxxList", policy).build(); + HashMap map = new HashMap<>(); + + map.put("zpxxList", zpxxList); + map.put("unionName", un.getString("unionName")); + map.put("num", users.size()); + map.put("memberNum", users.stream().filter(v -> v.getMember() == 1).collect(Collectors.toList()).size()); +// XWPFTemplate.compile(officeTemplateUtil.getPath("unionComment"), config).render(map).writeAndClose(outputStream); + + outputStream.close(); + } + + //压缩 + File zipFile = ZipUtil.zip(templateDir.toString()); + response.setHeader("content-disposition", "attachment;filename=" + + URLEncoder.encode(zipFile.getName(), "UTF-8")); + try (ServletOutputStream outputStream = response.getOutputStream(); + FileInputStream zipFis = new FileInputStream(zipFile);) { + IOUtils.copy(zipFis, outputStream); + } catch (Exception e) { + e.printStackTrace(); + } finally { + FileUtil.del(templateDir); + FileUtil.del(zipFile); + } + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewProxyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewProxyController.java new file mode 100644 index 00000000..d1d830d8 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewProxyController.java @@ -0,0 +1,64 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.review; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; + +/** + * @ClassName addZbController + * @Description TODO + * @Author zhf + * @Date 2023/9/4 15:42 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工评议-添加考核指标") +@At("/platform/workershome/review/proxy") +public class WorkersHomeReviewProxyController { + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/review/xjkhzb.html") + @SaCheckPermission("workershome.review.proxy") + public void index() { + } + + @Inject + private CommentZbService commentZbService; + + @At + @ApiOperation("添加指标") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("workershome.review.proxy") + public Result doAdd(@Param("kh_zb") WorkersHomeReviewProxy commentZb) { + WorkersHomeReviewProxy zb = commentZbService.insert(commentZb); + for (WorkersHomeReviewContent nr : commentZb.getReviewContents()) { + nr.setProxyId(zb.getId()); + nr.getReviewNorms().forEach(v->v.setProxyId(zb.getId())); + commentZbService.insertWith(nr, "bzs"); + } + commentZbService.setGrading(zb); + return Result.success(); + + } + + @At + @ApiOperation("获取指标列表") + public Result getZbList(Integer year) { + List annual = commentZbService.query(Cnd.NEW().andEX("annual", "=", year)); + return Result.success(annual); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewStatistics.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewStatistics.java new file mode 100644 index 00000000..d738c71b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewStatistics.java @@ -0,0 +1,441 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.review; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_file; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewGrading; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentPeoService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentStatisticsService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.io.IOUtils; +import org.nutz.boot.starter.ftp.FtpService; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.random.R; +import org.nutz.lang.util.NutMap; +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.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.net.URLEncoder; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * @ClassName statisticsController + * @Description TODO + * @Author zhf + * @Date 2023/9/5 15:58 + */ +@IocBean +@Ok("json:full") +@ApiOperation("职工评议-统计") +@At("/platform/workershome/review/statistics") +public class WorkersHomeReviewStatistics { + + @Inject + private Dao dao; + @Inject + private FtpService ftpService; + @Inject + private CommentZbService commentZbService; + @Inject + private CommentPeoService commentPeoService; + @Inject + private CommentStatisticsService commentStatisticsService; + + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/review/statistics.html") + @SaCheckPermission("workershome.review.statistics") + public void index() { + } + + @At + @ApiOperation("获取列表") + @SaCheckPermission("workershome.review.statistics") + public Result pageData(PageForm page, + @Param("zbId") String zbId, + @Param("unionId") String unionId) { + + WorkersHomeReviewProxy zb = commentPeoService.dao().fetch(WorkersHomeReviewProxy.class, Cnd.where("id", "=", zbId)); + Sql sql = Sqls.create(""" + SELECT + un.id, + un.unionname unionName, + IFNULL(grading.gradingName,'未定级') AS gradingName, + grading.isGrading, + count( peo.id ) num + FROM + sys_union un + LEFT JOIN `user` u ON u.unionId = un.id + LEFT JOIN comment_peo peo ON peo.userId = u.id AND peo.zbId = @zbId + LEFT JOIN comment_union_grading grading on un.id = grading.unionId AND grading.zbId = @zbId + $condition + """).setParam("zbId", zbId); + Cnd cnd = Cnd.NEW(); + + if (Lang.isNotEmpty(zb.getUnionIds())) { + cnd.and("un.id", "in", zb.getUnionIds()); + } else { + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + cnd.andEX("un.id", "=", unionId); + } else { + cnd.and("un.id", "=", SecurityUtil.getUnionId()); + } + } + + cnd.groupBy("un.id"); + cnd.desc("count( peo.id )"); + sql.setCondition(cnd); + Pagination pagination = commentZbService.listPageMap(page.getPageNumber(), page.getPageSize(), sql); + return Result.success(pagination); + } + + + @At + @ApiOperation("获取个人评议或工会评议列表") + @SaCheckPermission("workershome.review.statistics") + public Result getUserPeoByZbIdOrUnionId(PageForm page, + @Param("zbId") String zbId, + @Param("unionId") String unionId, + @Param("reviewResult") String reviewResult) { + Sql sql = Sqls.create(""" + SELECT + peo.*, + u.loginname loginName, + unitname unitName + FROM + comment_peo peo + LEFT JOIN `user` u ON u.id = peo.userId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("peo.zbId", "=", zbId); + cnd.andEX("u.unionId", "=", unionId); + cnd.andEX("peo.reviewResult", "=", reviewResult); + if (StrUtil.isNotBlank(page.getSearchKeyword())) { + SqlExpressionGroup sqlExpressionGroup = new SqlExpressionGroup(); + sqlExpressionGroup.orLike("u.loginname", page.getSearchKeyword()); + sqlExpressionGroup.orLike("u.username", page.getSearchKeyword()); + cnd.and(sqlExpressionGroup); + } + sql.setCondition(cnd); + Pagination pagination = commentZbService.listPageMap(page.getPageNumber(), page.getPageSize(), sql); + return Result.success(pagination); + } + + @At + @ApiOperation("根据id获取评测内容") + @SaCheckPermission("workershome.review.statistics") + public Result getBzById(String peoId) { + NutMap map = commentPeoService.getBzById(peoId); + return Result.success(map); + + } + + @At + @ApiOperation("获取评价结果数量") + @SaCheckPermission("workershome.review.statistics") + public Result getReviewResultNum(@Param("zbId") String zbId, + @Param("unionId") String unionId) { + Sql sql = Sqls.create(""" + SELECT + SUM( CASE WHEN cp.reviewResult = '非常满意' THEN 1 ELSE 0 END ) AS fcmy, + SUM( CASE WHEN cp.reviewResult = '满意' THEN 1 ELSE 0 END ) AS my, + SUM( CASE WHEN cp.reviewResult = '良好' THEN 1 ELSE 0 END ) AS lh, + SUM( CASE WHEN cp.reviewResult = '一般' THEN 1 ELSE 0 END ) AS yb + FROM + comment_peo cp + LEFT JOIN `user` u ON u.id = cp.userId + WHERE + cp.zbId = @zbId + AND u.unionId = @unionId + """).setParam("zbId", zbId).setParam("unionId", unionId); + sql.setCallback(Sqls.callback.map()); + dao.execute(sql); + NutMap mapList = (NutMap) sql.getResult(); + return Result.success(mapList); + } + + + /** + * 分工会自评导出（单个） + * + * @param zbId + * @param unionId + * @param response + */ + @At + @Ok("void") + @ApiOperation("分工会自评导出（单个）") + @SaCheckPermission("workershome.review.statistics") + public void doDownLoadSingleByUnionId(String zbId, String unionId, HttpServletResponse response) { + WorkersHomeReviewPeo peo = commentZbService.dao().fetch(WorkersHomeReviewPeo.class, Cnd.where("unionId", "=", unionId).and("zbId", "=", zbId)); + + String fileName = peo.getUnionName() + "(" + peo.getUserName() + ")“模范教工小家”评议结果"; + try { + response.addHeader("Content-Type", "application/octet-stream"); + response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes("UTF-8"), "ISO-8859-1") + "\".docx"); + commentStatisticsService.exportWord(peo, response.getOutputStream()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * 分工会下所有测评结果导出(多个)压缩包 + * + * @param zbId + * @param unionId + * @param response + */ + @At + @Ok("void") + @ApiOperation("分工会下所有测评结果导出(多个)压缩包") + @SaCheckPermission("workershome.review.statistics") + public void doDownLoadZipByUnionId(String zbId, String unionId, HttpServletResponse response) { + try { + List peoList = commentPeoService.dao().query(WorkersHomeReviewPeo.class, Cnd.where("unionId", "=", unionId).and("zbId", "=", zbId)); + WorkersHomeReviewPeo commentPeo = peoList.stream().findFirst().orElse(new WorkersHomeReviewPeo()); + String zipName = commentPeo.getUnionName() + "评议结果.zip"; + response.setContentType("application/octet-stream"); + response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(zipName, "UTF-8")); + + ZipOutputStream zipOutputStream = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); + for (WorkersHomeReviewPeo peo : peoList) { + String fileName = peo.getUnionName() + "(" + peo.getUserName() + ")“模范教工小家”评议结果.docx"; + zipOutputStream.putNextEntry(new ZipEntry(fileName)); + commentStatisticsService.exportWord(peo, zipOutputStream); + zipOutputStream.closeEntry(); + response.flushBuffer(); + } + zipOutputStream.flush(); + zipOutputStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * 校验是否有附件 + * + * @param peoId 测评结果Id + * @param zbId 指标Id + * @param unionId 分工会Id + * @return + */ + @At + @ApiOperation("校验是否有附件") + @SaCheckPermission("workershome.review.statistics") + public Result validateHasFiles(@Param("peoId") String peoId, + @Param("zbId") String zbId, + @Param("unionId") String unionId) { + Cnd cnd = Cnd.NEW(); + cnd.andEX("id", "=", peoId); + cnd.andEX("zbId", "=", zbId); + cnd.andEX("unionId", "=", unionId); + List peoList = commentPeoService.dao().query(WorkersHomeReviewPeo.class, cnd); + List files; + try { + files = peoList.stream().flatMap(v -> v.getFiles().stream()).toList(); + } catch (NullPointerException e) { + return Result.error(); + } + if (Lang.isEmpty(files)) { + return Result.error(); + } else { + return Result.success(); + } + } + + + /** + * 分工会导出附件 + * + * @param zbId + * @param unionId + * @param response + */ + @At + @Ok("void") + @ApiOperation("分工会导出附件") + @SaCheckPermission("workershome.review.statistics") + public void exportFilesByUnionId(String zbId, String unionId, HttpServletResponse response) { + List peoList = commentPeoService.dao().query(WorkersHomeReviewPeo.class, Cnd.where("unionId", "=", unionId).and("zbId", "=", zbId)); + WorkersHomeReviewPeo commentPeo = peoList.stream().findFirst().orElse(new WorkersHomeReviewPeo()); + response.reset(); + response.setContentType("application/x-msdownload;charset=utf-8"); + + String tmpPath = "tmp/" + R.UU32(); + File tmpDir = new File(tmpPath + "/附件信息"); + tmpDir.mkdirs(); + + try { + for (WorkersHomeReviewPeo peo : peoList) { + String fileName = peo.getUnionName() + "(" + peo.getUserName() + ")"; + List files = peo.getFiles(); + + File tDir = new File(tmpDir + "/" + fileName); + tDir.mkdirs(); + + if (Lang.isNotEmpty(files)) { +// for (Sys_file file : files) { +// if (Lang.isNotEmpty(file)) { +// FileOutputStream outputStream = new FileOutputStream(tDir.getPath() + "/" + file.getFilename()); +// ftpService.download(file.getFilepath(), outputStream); +// outputStream.close(); +// } +// } + } + } + + String aimsDir = "zipTmp/" + R.UU32(); + String aimsName = commentPeo.getUnionName() + "评议信息.zip"; + String aimsPath = aimsDir + "/" + aimsName; +// FileUtil.compressToZip(tmpDir.getPath(), aimsDir, aimsName); + + response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(aimsName, "UTF-8")); + + File aimsFile = new File(aimsPath); + FileInputStream inputStream = new FileInputStream(aimsFile); + IOUtils.copy(inputStream, response.getOutputStream()); + inputStream.close(); + aimsFile.delete(); + +// FileUtil.deleteDir(new File(tmpPath)); +// FileUtil.deleteDir(new File(aimsDir)); + } catch (Exception e) { + e.printStackTrace(); + } + + } + + + /** + * 个人上传附件导出 + * + * @param peoId + * @param response + */ + @At + @Ok("void") + @ApiOperation("个人上传附件导出") + @SaCheckPermission("workershome.review.statistics") + public void exportFilesByPeoId(String peoId, HttpServletResponse response) { + WorkersHomeReviewPeo peo = commentPeoService.dao().fetch(WorkersHomeReviewPeo.class, peoId); + List files = peo.getFiles(); + + response.reset(); + response.setContentType("application/x-msdownload;charset=utf-8"); + + String tmpPath = "tmp/" + R.UU32(); + File tmpDir = new File(tmpPath + "/个人附件信息"); + tmpDir.mkdirs(); + + try { + for (Sys_file file : files) { +// if (Lang.isNotEmpty(files)) { +// FileOutputStream out = new FileOutputStream(tmpDir.getPath() + "/" + file.getFilename()); +// ftpService.download(file.getFilepath(), out); +// out.close(); +// } + } + String aimsDir = "zipTmp/" + R.UU32(); + String aimsName = peo.getUnionName() + "(" + peo.getUserName() + ")个人附件信息.zip"; + String aimsPath = aimsDir + "/" + aimsName; +// FileUtil.compressToZip(tmpDir.getPath(), aimsDir, aimsName); + + response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(aimsName, "UTF-8")); + + File aimsFile = new File(aimsPath); + FileInputStream inputStream = new FileInputStream(aimsFile); + IOUtils.copy(inputStream, response.getOutputStream()); + inputStream.close(); + aimsFile.delete(); + +// FileUtil.deleteDir(new File(tmpPath)); +// FileUtil.deleteDir(new File(aimsDir)); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * 个人评议结果导出(得分) + * + * @param peoId + * @param response + */ + @At + @Ok("void") + @ApiOperation("个人评议结果导出(得分)") + @SaCheckPermission("workershome.review.statistics") + public void exportByPeoId(String peoId, HttpServletResponse response) { + WorkersHomeReviewPeo peo = commentPeoService.dao().fetch(WorkersHomeReviewPeo.class, peoId); + + String fileName = peo.getUnionName() + "(" + peo.getUserName() + ")“模范教工小家”评议结果"; + try { + response.addHeader("Content-Type", "application/octet-stream"); + response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes("UTF-8"), "ISO-8859-1") + "\".docx"); + commentStatisticsService.exportWord(peo, response.getOutputStream()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * 导出所有分工会评议结果和附件信息 + * + * @param zbId + * @param response + */ + @At + @Ok("void") + @SaCheckPermission("workershome.review.statistics") + public void exportAllUnions(String zbId, HttpServletResponse response) { +// List peoList = commentPeoService.dao().query(CommentPeo.class, Cnd.where("zbId", "=", zbId)); + +// Map> collect = peoList.stream().collect(Collectors.groupingBy(CommentPeo::getUnionId)); + } + + + @At + @ApiOperation("评级") + @SaCheckPermission("workershome.review.statistics") + public Result doGrading(WorkersHomeReviewGrading grading){ + if (StrUtil.isAllBlank(grading.getProxyId(),grading.getUnionId(),grading.getGradingName())) { + return Result.error("必要参数为空"); + } + commentPeoService.dao().update(WorkersHomeReviewGrading.class, + Chain.make("isGrading",true).add("gradingName",grading.getGradingName()).add("gradingTime", DateUtil.now()), + Cnd.where("zbId","=",grading.getProxyId()).and("unionId","=",grading.getUnionId())); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewViewController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewViewController.java new file mode 100644 index 00000000..6d20d770 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/controller/review/WorkersHomeReviewViewController.java @@ -0,0 +1,165 @@ +package com.budwk.app.zhgh.dayofficework.workershome.controller.review; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentBzService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentNrService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +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.random.R; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; + +/** + * @ClassName viewZbController + * @Description TODO + * @Author zhf + * @Date 2023/9/4 16:00 + */ +@IocBean +@Ok("json:full") +@ApiOperation("指标查看") +@At("/platform/workershome/review/view") +public class WorkersHomeReviewViewController { + + + @Inject + private CommentZbService commentZbService; + + @Inject + private CommentNrService commentNrService; + + @Inject + private CommentBzService commentBzService; + + + @At("") + @Ok("beetl:/platform/zhgh/dayofficework/workershome/review/khzb.html") + @SaCheckPermission("workerhome.review.view") + public void index() { + + } + + @At + @ApiOperation("指标查看分页数据") + @SaCheckPermission("workerhome.review.view") + public Result pageData(@Param("annual") String annual, + @Param("assessment") String assessment, + int pageNumber, int pageSize) { + Sql sql = Sqls.create("SELECT * FROM `comment_zb` $condition"); + Cnd cnd = Cnd.NEW(); + if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) { + cnd.and("annual", "=", annual); + } + if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) { + cnd.where().andLike("assessment", assessment); + } else { + cnd.desc("annual"); + } + sql.setCondition(cnd); + Pagination pagination = commentZbService.listPageMap(pageNumber, pageSize, sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("指标删除") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("workerhome.review.view") + @SLog(tag = "指标删除", msg = "指标删除id: ${args[0]}") + public Result delete(String id) { + commentZbService.delete(id); + List query = commentNrService.query(Cnd.where("zb_id", "=", id)); + + if (Lang.isNotEmpty(query)) { + List nrIds = query.stream().map(WorkersHomeReviewContent::getId).toList(); + commentBzService.clear(Cnd.where("nr_id", "in", nrIds)); + } + commentNrService.clear(Cnd.where("zb_id", "=", id)); + return Result.success(); + } + + + @At + @ApiOperation("获取编辑内容") + @SaCheckPermission("workerhome.review.view") + @SLog(tag = "获取编辑内容", msg = "编辑内容id: ${args[0]}") + public Result edit(String id) { + WorkersHomeReviewProxy khzb = commentZbService.khzb(id); + return Result.success().addData(khzb); + } + + + @At + @ApiOperation("指标编辑") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("workerhome.review.view") + @SLog(tag = "指标编辑", msg = "指标编辑id: ${args[0]}") + public Result doEdit(@Param("kh_zb") WorkersHomeReviewProxy commentZb) { + commentZbService.updateIgnoreNull(commentZb); + + List query = commentNrService.query(Cnd.where("zb_id", "=", commentZb.getId())); + + if (Lang.isNotEmpty(query)) { + List nrIds = query.stream().map(WorkersHomeReviewContent::getId).toList(); + commentBzService.clear(Cnd.where("nr_id", "in", nrIds)); + } + + commentNrService.clear(Cnd.where("zb_id", "=", commentZb.getId())); + List nrs = commentZb.getReviewContents(); + if (Lang.isNotEmpty(nrs)){ + nrs.forEach(v->{ + if (v.getId() == null) { + v.setId(R.UU32()); + } + Chain chain = Chain.make("id", v.getId()); + chain.add("zb_id",commentZb.getId()); + chain.add("content",v.getContent()); + chain.add("contentNumber",v.getContentNumber()); + chain.add("remark",v.getRemark()); + commentNrService.dao().insert(WorkersHomeReviewContent.class, chain); + + List bzs = v.getReviewNorms(); + bzs.forEach(b->{ + if (b.getId() == null) { + b.setId(R.UU32()); + } + Chain bzChain = Chain.make("id", b.getId()); + bzChain.add("nr_id",v.getId()); + bzChain.add("inspection",b.getInspection()); + bzChain.add("score",b.getScore()); + bzChain.add("single_score",b.getSingleScore()); + bzChain.add("zb_id",commentZb.getId()); + bzChain.add("contentNumber",b.getContentNumber()); + commentNrService.dao().insert(WorkersHomeReviewNorm.class, bzChain); + + }); + + + }); + + } + commentZbService.setGrading(commentZb); + return Result.success(); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/h5controller/MWorkersHomeReviewController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/h5controller/MWorkersHomeReviewController.java new file mode 100644 index 00000000..c3cbde94 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/h5controller/MWorkersHomeReviewController.java @@ -0,0 +1,301 @@ +package com.budwk.app.zhgh.dayofficework.workershome.h5controller; + + +import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewResult; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentPeoService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import com.budwk.app.zhgh.dayofficework.workershome.vo.WakesHomeVo; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.Static; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@IocBean +@At("/mobile/workershome/review/appraisal") +@Ok("json:full") +public class MWorkersHomeReviewController { + + @Inject + private CommentZbService commentZbService; + + @Inject + private BaseService baseService; + + @Inject + private CommentPeoService commentPeoService; + + @At + @Ok("beetl:/mobile/workershome/review/appraisal.html") + @SaCheckLogin + public void index() { + } + + @At + @Ok("beetl:/mobile/workershome/review/commentator.html") + @SaCheckLogin + public void commentator() { + } + + + @At + @Ok("beetl:/mobile/workershome/review/mine.html") + @SaCheckLogin + public void mine() { + } + + + /** + * 民主测评首页展示 + * + * @param pageForm + * @param annual + * @return + */ + @At + @SaCheckPermission + public Object pageData(PageForm pageForm, + @Param("annual") String annual, + @Param("type") Integer type) { + Sql sql = Sqls.create("SELECT * FROM `comment_zb` $condition"); + Cnd cnd = Cnd.NEW(); + if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) { + cnd.and("annual", "=", annual); + } + switch (type) { + //进行中 + case 2 -> cnd.and(new Static("now() >= startTime and now() <= endTime")); + //已结束 + case 3 -> cnd.and(new Static("now() > endTime")); + //未开始 + case 4 -> cnd.and(new Static("now() < startTime")); + } + sql.setCondition(cnd); + Pagination pagination = commentZbService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + List list = pagination.getList(); + List unionList = commentZbService.dao().query(Sys_union.class, Cnd.NEW()); + list.forEach(v -> { + //自评模式 + boolean reviewMode = v.getInt("reviewMode") == 1; + if (reviewMode && v.getInt("commentTarget") == 1) { + //校工会自评，判断有没有校工会管理员的权限 + v.put("canJoin", AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())); + } else if (reviewMode && v.getInt("commentTarget") == 2) { + //分工会自评，判断有没有分工会管理员 + v.put("canJoin", AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())); + } + + //自选分工会的模式 + if (StrUtil.isNotBlank(v.getString("unionIds"))) { + List unionIdList = JSONUtil.parseArray(v.getString("unionIds")).toList(String.class); + String string = unionList.stream().filter(item -> unionIdList.contains(item.getId())) + .map(Sys_union::getName).collect(Collectors.joining(",")); + v.put("unionNames", string); + //如果是自评，只有分工会主席才能自评 + if (reviewMode) { + v.put("canJoin", (unionIdList.contains(SecurityUtil.getUnionId()) && AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()))); + } else { + v.put("canJoin", unionIdList.contains(SecurityUtil.getUnionId())); + } + } + }); + return pagination; + } + + + /** + * 根据id获取测评内容 + * + * @param id + * @return + */ + @At + @SaCheckPermission + public Object getById(String id) { + return commentZbService.khzb(id); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + public Object doSubmit(WakesHomeVo wakesHomeVo) { + try { + View_user user = baseService.dao().fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId())); + WorkersHomeReviewPeo peo = new WorkersHomeReviewPeo(); + if (Strings.isNotBlank(wakesHomeVo.getEvaluatedPersonId())) { + peo.setEvaluatedPersonId(wakesHomeVo.getEvaluatedPersonId()); + peo.setEvaluatedPersonName(wakesHomeVo.getEvaluatedPersonName()); + peo.setEvaluatedPersonType(wakesHomeVo.getEvaluatedPersonType()); + } + peo.setReviewResult(wakesHomeVo.getReviewResult()); + peo.setProxyId(wakesHomeVo.getId()); + peo.setReviewTime(DateUtil.now()); +// peo.setFiles(wakesHomeVo.getFiles()); + peo.setUserId(user.getId()); + peo.setUserName(user.getUsername()); + peo.setUnionId(user.getUnionId()); + peo.setUnionName(user.getUnionName()); + if (Strings.isNotBlank(wakesHomeVo.getPresidentOpinions())) { + peo.setPresidentOpinions(wakesHomeVo.getPresidentOpinions()); + } + baseService.dao().insert(peo); + List commentResults = new ArrayList<>(); + for (WorkersHomeReviewNorm v : wakesHomeVo.getBzList()) { + WorkersHomeReviewResult result = new WorkersHomeReviewResult(); + result.setProxyId(v.getId()); + result.setAssessResult(v.getResultScore()); + result.setRecommendation(v.getOptions() != null ? v.getOptions() : null); + result.setPeoId(peo.getId()); + commentResults.add(result); + } + baseService.dao().insert(commentResults); + return Result.success(); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(); + } + } + + + /** + * 判断是否测评过 + * + * @param id 指标id + * @param evaluatedPersonId 被测评人id + * @return + */ + @At + public Object isAssess(@Param("id") String id, + @Param("evaluatedPersonId") String evaluatedPersonId) { + //主席测评 + if (Strings.isNotBlank(evaluatedPersonId)) { + Cnd cnd = Cnd.NEW(); + cnd.and("evaluatedPersonId", "=", evaluatedPersonId); + cnd.and("userId", "=", SecurityUtil.getUserId()); + cnd.and("zbId", "=", id); + return Result.success().addData(baseService.dao().count(WorkersHomeReviewPeo.class, cnd)); + } else {//会员评家测评 + Sql sql = Sqls.create(""" + SELECT + cp.*, + cz.annual, + cz.assessment, + cz.assessmentMode, + cz.scoringMode, + cz.commentTarget + FROM + `comment_peo` cp + LEFT JOIN `comment_zb` cz ON cz.id = cp.zbId + where cp.zbId=@zbId and cp.userId=@userId + """).setParam("zbId", id).setParam("userId", SecurityUtil.getUserId()); + List list = baseService.listMap(sql); + NutMap nutMap = list.stream().findFirst().orElse(null); + if (nutMap != null && Strings.isNotBlank(nutMap.getString("commentTarget")) && "1".equals(nutMap.getString("assessmentMode"))) { + return Result.success().addData(1); + } else { + return Result.success().addData(0); + } + } + } + + + /** + * 我的测评页面展示 + * + * @param pageForm + * @param annual + * @return + */ + @At + public Object onLoad(PageForm pageForm, + @Param("annual") String annual) { + Sql sql = Sqls.create(""" + SELECT + cp.*, + cz.annual, + cz.assessment, + cz.assessmentMode, + cz.scoringMode, + cz.commentTarget + FROM + `comment_peo` cp + LEFT JOIN `comment_zb` cz ON cz.id = cp.zbId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("cz.annual", "=", annual); + cnd.and("cp.userId", "=", SecurityUtil.getUserId()); + cnd.desc("cp.reviewTime"); + sql.setCondition(cnd); + return baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + } + + + /** + * 获取测评结果信息 + * + * @param peoId + * @return + */ + @At + public Object getBzById(@Param("peoId") String peoId) { + return commentPeoService.getBzById(peoId); + } + + /** + * 获取分工会主席和副主席 + * + * @return + */ + @At + public Object getPresidents() { + Sql sql = Sqls.create(""" + SELECT + u.id, + u.loginname, + u.username, + sr.`name` evaluatedPersonType, + GROUP_CONCAT( DISTINCT u.username, '(', sr.`name`, ')' ) presidents + FROM + `user` u + LEFT JOIN `sys_user_role` sur ON u.id = sur.userId + LEFT JOIN `sys_role` sr ON sur.roleId = sr.id + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.and("sr.`code`", "in", List.of(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_VICE_CHAIRMAN.name())); + cnd.and("u.unionid", "=", SecurityUtil.getUnionId()); + cnd.groupBy("u.id"); + cnd.asc("u.loginname"); + sql.setCondition(cnd); + return baseService.listMap(sql); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHome.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHome.java new file mode 100644 index 00000000..7e73320e --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHome.java @@ -0,0 +1,130 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model; + +import cn.hutool.json.JSONObject; +import com.budwk.app.base.model.BaseModel; +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; + +/** + * @author mayn + */ +@Data +@Table +@Comment("职工小家-职工小家表") +@EqualsAndHashCode(callSuper = true) +public class WorkersHome extends BaseModel { + + @Name + @Column + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("填报人") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String username; + + @Column + @Comment("联系方式") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String mobile; + + @Column + @Comment("所属工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("工会名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionName; + + @Column + @Comment("填报时间") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String applyTime; + + @Column + @Comment("填报类别（校工会/分工会）") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String category; + + @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 awardInfo; + + @Column + @Comment("图片文件") + @ColDefine(type = ColType.MYSQL_JSON) + private List picFiles; + + @Column + @Comment("附件") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; + + @Column + @Comment("分工会审核id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionAuditId; + + @Column + @Comment("校工会审核id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String schoolAuditId; + + @Column + @Comment("状态") + @ColDefine(type = ColType.INT) + private Integer state; + + + @Data + public static class AwardInfo implements Serializable { + /** + * 获奖日期 + */ + private String awardTime; + /** + * 获奖单位 + */ + private String awardUnit; + /** + * 奖项名称 + */ + private String awardName; + /** + * 奖项照片 + */ + private String awardPic; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeApply.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeApply.java new file mode 100644 index 00000000..7ac1ceda --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeApply.java @@ -0,0 +1,130 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model; + +import cn.hutool.json.JSONObject; +import com.budwk.app.base.model.BaseModel; +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 + * @Author zzr + * @name：WakesHomeApply + * @Date 2024/7/31 10:47 + * @注释 职工之家申报 + */ +@Data +@Table +@Comment("职工之家申报") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeApply extends BaseModel implements Serializable { + + private static final long serialVersionUID = 1L; + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("申报人id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("申报人工号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String loginName; + + @Column + @Comment("申报人姓名") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String username; + + @Column + @Comment("申报人单位id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unitId; + + @Column + @Comment("申报人单位名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unitName; + + @Column + @Comment("申报人工会Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("申报人工会名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionName; + + @Column + @Comment("联系电话") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String mobile; + + @Column + @Comment("基本情况简介（500字内）") + @ColDefine(type = ColType.TEXT) + private String basicInformation; + + @Column + @Comment("建设方案") + @ColDefine(type = ColType.TEXT) + private String constructionPlan; + + @Column + @Comment("基层党组织审核Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String organizationAuditId; + + @Column + @Comment("校工会审核Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String schoolAuditId; + + //10000待提交；10010待基层党组织审核；10020待校工会审核；10030审核通过 + @Column + @Comment("当前状态") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String state; + + @Column + @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/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeDataRevel.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeDataRevel.java new file mode 100644 index 00000000..058b08a7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeDataRevel.java @@ -0,0 +1,95 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model; + +import com.budwk.app.base.model.BaseModel; +import com.budwk.app.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.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：WakesHomeDataRevel + * @Date 2024/7/30 15:29 + * @注释 职工建家资料管理 + */ +@Data +@Table +@Comment("职工建家资料管理") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeDataRevel extends BaseModel { + + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("资料名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String revelName; + + @Column + @Comment("上传人id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("上传人工号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String loginName; + + @Column + @Comment("上传人姓名") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String username; + + @Column + @Comment("上传人单位id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unitId; + + @Column + @Comment("上传人单位名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String unitName; + + @Column + @Comment("上传人工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("上传人工会名称") + @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) + private String time; + + @Column + @Comment("类型Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String typeId; + + @Column + @Comment("附件") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeDataType.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeDataType.java new file mode 100644 index 00000000..f278f41a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/WorkersHomeDataType.java @@ -0,0 +1,43 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +/** + * @version 1.0 + * @Author zzr + * @name：WakesHomeDataType + * @Date 2024/7/30 15:29 + * @注释 职工建家资料类型管理 + */ +@Data +@Table +@Comment("职工建家资料类型管理") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeDataType extends BaseModel { + + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("类型编码") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String code; + + @Column + @Comment("工作资料类型名称") + @ColDefine(type = ColType.VARCHAR, width = 80) + private String typeName; + + @Column + @Comment("序号") + @ColDefine(type = ColType.INT) + private Integer serialNum; + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewContent.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewContent.java new file mode 100644 index 00000000..700e07e7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewContent.java @@ -0,0 +1,58 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +import java.util.List; + +/** + * @ClassName CommentNr + * @Description TODO + * @Author zhf + * @Date 2023/9/4 16:13 + */ +@Data +@Table +@Comment("职工小家-评议内容") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewContent extends BaseModel { + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + @Column + @Comment("考核内容") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String content; + + @Column + @Comment("题号") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String contentNumber; + + @Column + @Comment("指标id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String proxyId; + + @One(field = "proxyId",key = "id") + private WorkersHomeReviewProxy reviewProxy; + + @Many(field = "contentId") + private List reviewNorms; + + @Column + @Comment("排序字段") + private Integer location; + + @Column + @Comment("备注") + @ColDefine(type = ColType.TEXT) + private String remark; +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewExport.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewExport.java new file mode 100644 index 00000000..bceb0eef --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewExport.java @@ -0,0 +1,49 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +import java.util.List; + +/** + * @ClassName CommentExport + * @Description TODO + * @Author zhf + * @Date 2023/9/7 15:19 + */ +@Data +@Table +@Comment("职工小家-评议导出") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewExport extends BaseModel { + + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + + @Column + @Comment("导出的名称") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String exportName; + + // 指标id + @Column + @Comment("proxyIds") + @ColDefine(type = ColType.MYSQL_JSON) + private List proxyIds; + + + @Column + @Comment("创建时间") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String createTime; + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewGrading.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewGrading.java new file mode 100644 index 00000000..dfa3f71f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewGrading.java @@ -0,0 +1,66 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +import java.util.Date; + +/** + * @version 1.0 + * @Author zzr + * @name：CommentUnionGrading + * @Date 2024/9/19 8:48 + * @注释 校工会给分工会定级 + */ +@Data +@Table +@Comment("校工会给分工会定级表") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewGrading extends BaseModel { + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + @Column + @Comment("考核指标id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String proxyId; + + @Column + @Comment("定级的分工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("分工会名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionName; + + @Column + @Comment("分工会编码") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionCode; + + @Column + @Comment("定级的名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String gradingName; + + @Column + @Default("0") + @Comment("是否定级") + @ColDefine(type = ColType.BOOLEAN) + private Boolean isGrading; + + @Column + @Comment("定级时间") + @ColDefine(type = ColType.DATETIME) + private Date gradingTime; + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewNorm.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewNorm.java new file mode 100644 index 00000000..8e3c95d6 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewNorm.java @@ -0,0 +1,97 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +/** + * @ClassName CommentBz + * @Description TODO + * @Author zhf + * @Date 2023/9/4 16:24 + * 职工小家评议标准 + */ +@Data +@Table +@Comment("职工小家-评议标准") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewNorm extends BaseModel { + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + + @Column + @Comment("内容id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String contentId; + + + @Column + @Comment("考核标准") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String inspection; + + + @Column + @Comment("是否启用佐证材料") + @ColDefine(type = ColType.BOOLEAN) + private boolean isEvidence; + + @Column + @Comment("标准分") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String score; + + @Column + @Comment("单项得分") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String singleScore; + + @Column + @Comment("自评能否超过最高分") + @ColDefine(type = ColType.BOOLEAN) + private boolean beyondHighestScore; + + @Column + @Comment("关联模块") + @ColDefine(type = ColType.VARCHAR,width = 100) + private String associatedModule; + + @Column + @Comment("标准标识") + @ColDefine(type = ColType.VARCHAR,width = 100) + private String normRelationId; + + @Column + @Comment("指标id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String proxyId; + + + @Column + @Comment("题号") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String contentNumber; + + @Column + @Comment("排序字段") + private Integer location; + + @Column + @Comment("能否删除该项") + @ColDefine(type = ColType.BOOLEAN) + private boolean canDelete; + + @One(field = "contentId", key = "id") + private WorkersHomeReviewContent reviewContent; + + private String resultScore; + + private String options; +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewPeo.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewPeo.java new file mode 100644 index 00000000..468cdb2e --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewPeo.java @@ -0,0 +1,93 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + + +import com.budwk.app.base.model.BaseModel; +import com.budwk.app.sys.models.Sys_file; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +import java.util.List; + +/** + * @author mayn + */ +@Data +@Table +@Comment("职工小家-测评人记录") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewPeo extends BaseModel { + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + @Column + @Comment("测评人") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("测评人姓名") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String userName; + + @Column + @Comment("测评人工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("测评人工会名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionName; + + @Column + @Comment("被测评人id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String evaluatedPersonId; + + @Column + @Comment("被测评人姓名") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String evaluatedPersonName; + + @Column + @Comment("被测评人职务(主席/副主席)") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String evaluatedPersonType; + + + @Column + @Comment("指标id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String proxyId; + + @Column + @Comment("主席测评意见") + @ColDefine(type = ColType.TEXT) + private String presidentOpinions; + + @Column + @Comment("评测结果") + @ColDefine(type = ColType.VARCHAR,width = 10) + private String reviewResult; + + @Column + @Comment("测评时间") + @ColDefine(type = ColType.VARCHAR,width = 20) + private String reviewTime; + + + @Many(field = "peoId") + private List resultList; + + + @Column + @Comment("自我测评的附件") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewProxy.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewProxy.java new file mode 100644 index 00000000..c61ba0b1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewProxy.java @@ -0,0 +1,96 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * @ClassName CommentZb + * @Description TODO + * @Author zhf + * @Date 2023/9/4 15:39 + * 评议指标 + */ +@Data +@Table +@Comment("职工小家-评议指标") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewProxy extends BaseModel { + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + @Column + @Comment("年度") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String annual; + + @Column + @Comment("考核名称") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String assessment; + + @Column + @Comment("添加时间") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String addTime; + + @Column + @Comment("评议选项（1.工会评家2.主席评家）") + @ColDefine(type = ColType.INT) + private Integer assessmentMode; + + @Column + @Comment("可报名范围组别") + @ColDefine(type = ColType.VARCHAR, width = 32) + private Integer activityGroupId; + + @Column + @Comment("评议范围(1.校工会 2.全部分工会 3.自选分工会)") + @ColDefine(type = ColType.INT) + private Integer commentTarget; + + @Column + @Comment("打分模式（1.评分模式2.选择满意不满意模式）") + @ColDefine(type = ColType.INT) + private Integer scoringMode; + + + @Many(field = "proxyId") + private List reviewContents; + + @Column + @Comment("排序字段") + private Integer location; + + + @Column + @Comment("自选分工会Id") + @ColDefine(type = ColType.MYSQL_JSON) + private List unionIds; + + @Column + @Comment("评议开始时间") + @ColDefine(type = ColType.DATETIME) + private Date startTime; + + + @Column + @Comment("评议结束时间") + @ColDefine(type = ColType.DATETIME) + private Date endTime; + + + @Column + @Comment("评议模式（1.自评模式 2.教职工评议）") + @ColDefine(type = ColType.INT) + private Integer reviewMode; +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewResult.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewResult.java new file mode 100644 index 00000000..b9e7cba5 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/model/review/WorkersHomeReviewResult.java @@ -0,0 +1,52 @@ +package com.budwk.app.zhgh.dayofficework.workershome.model.review; + + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; + +/** + * @author mayn + */ +@Data +@Table +@Comment("职工小家-评测结果表") +@EqualsAndHashCode(callSuper = true) +public class WorkersHomeReviewResult extends BaseModel { + + @Column + @Name + @Comment("id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Prev(els = {@EL("uuid()")}) + private String id; + + + @Column + @Comment("测评人表id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String peoId; + + + @Column + @Comment("测评标准id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String proxyId; + + + @Column + @Comment("测评分数/满意度") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String assessResult; + + + @Column + @Comment("会员评家意见或建议") + @ColDefine(type = ColType.TEXT) + private String recommendation; + + + @One(field = "peoId",key = "id") + private WorkersHomeReviewPeo reviewPeo; +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/WorkersHomeApplyService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/WorkersHomeApplyService.java new file mode 100644 index 00000000..5b0eb889 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/WorkersHomeApplyService.java @@ -0,0 +1,28 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import org.nutz.lang.util.NutMap; + +/** + * @version 1.0 + * @Author zzr + * @name：WorkersHomeApplyService + * @Date 2024/7/31 11:09 + * @注释 + */ +public interface WorkersHomeApplyService extends BaseService { + + /** + * 根据id获取信息 + * @param id + * @return + */ + NutMap findById(String id); + + /** + * 设置参数 + * @param wakesHomeApply + */ + void setParams(WorkersHomeApply wakesHomeApply); +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/WorkersHomeInfoService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/WorkersHomeInfoService.java new file mode 100644 index 00000000..dca80ab3 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/WorkersHomeInfoService.java @@ -0,0 +1,7 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHome; + +public interface WorkersHomeInfoService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/WorkersHomeApplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/WorkersHomeApplyServiceImpl.java new file mode 100644 index 00000000..c62842d5 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/WorkersHomeApplyServiceImpl.java @@ -0,0 +1,58 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.model.Audit; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHomeApply; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeApplyService; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.random.R; +import org.nutz.lang.util.NutMap; + +/** + * @version 1.0 + * @Author zzr + * @name：WakesHomeApplyServiceImpl + * @Date 2024/7/31 11:10 + * @注释 + */ +@IocBean(args = {"refer:dao"}) +public class WorkersHomeApplyServiceImpl extends BaseServiceImpl implements WorkersHomeApplyService { + public WorkersHomeApplyServiceImpl(Dao dao) { + super(dao); + } + + + @Override + public NutMap findById(String id) { + WorkersHomeApply apply = fetch(id); + NutMap nutMap = Lang.obj2nutmap(apply); + if (StrUtil.isNotBlank(apply.getOrganizationAuditId())) { + Audit audit = dao().fetch(Audit.class, Cnd.where("id", "=", apply.getOrganizationAuditId())); + nutMap.put("organizationAudit", Lang.obj2nutmap(audit)); + } + if (StrUtil.isNotBlank(apply.getSchoolAuditId())) { + Audit audit = dao().fetch(Audit.class, Cnd.where("id", "=", apply.getSchoolAuditId())); + nutMap.put("schoolAudit", Lang.obj2nutmap(audit)); + } + return nutMap; + } + + + @Override + public void setParams(WorkersHomeApply wakesHomeApply) { + View_user user = dao().fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId())); + wakesHomeApply.setId(R.UU32()); + wakesHomeApply.setApplyDate(DateUtil.today()); + wakesHomeApply.setUnitId(user.getUnitId()); + wakesHomeApply.setUnitName(user.getUnitName()); + wakesHomeApply.setUnionId(user.getUnionId()); + wakesHomeApply.setUnionName(user.getUnionName()); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/WorkersHomeInfoServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/WorkersHomeInfoServiceImpl.java new file mode 100644 index 00000000..9fc20459 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/WorkersHomeInfoServiceImpl.java @@ -0,0 +1,14 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl; + +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.dayofficework.workershome.model.WorkersHome; +import com.budwk.app.zhgh.dayofficework.workershome.service.WorkersHomeInfoService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +@IocBean(args = {"refer:dao"}) +public class WorkersHomeInfoServiceImpl extends BaseServiceImpl implements WorkersHomeInfoService { + public WorkersHomeInfoServiceImpl(Dao dao) { + super(dao); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentBzServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentBzServiceImpl.java new file mode 100644 index 00000000..9422d5d6 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentBzServiceImpl.java @@ -0,0 +1,20 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl.review; + +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentBzService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +/** + * @ClassName CommentBzServiceImpl + * @Description TODO + * @Author zhf + * @Date 2023/9/4 16:30 + */ +@IocBean(args = {"refer:dao"}) +public class CommentBzServiceImpl extends BaseServiceImpl implements CommentBzService { + public CommentBzServiceImpl(Dao dao) { + super(dao); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentNrServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentNrServiceImpl.java new file mode 100644 index 00000000..0289068f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentNrServiceImpl.java @@ -0,0 +1,20 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl.review; + +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentNrService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +/** + * @ClassName CommentNrServiceImpl + * @Description TODO + * @Author zhf + * @Date 2023/9/4 16:28 + */ +@IocBean(args = {"refer:dao"}) +public class CommentNrServiceImpl extends BaseServiceImpl implements CommentNrService { + public CommentNrServiceImpl(Dao dao) { + super(dao); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentPeoServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentPeoServiceImpl.java new file mode 100644 index 00000000..28af909e --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentPeoServiceImpl.java @@ -0,0 +1,64 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl.review; + + +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewResult; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentPeoService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@IocBean(args = {"refer:dao"}) +public class CommentPeoServiceImpl extends BaseServiceImpl implements CommentPeoService { + + public CommentPeoServiceImpl(Dao dao) {super(dao);} + + @Inject + private BaseService baseService; + + @Inject + private CommentZbService commentZbService; + + /** + * 获取测评结果信息 + * @param peoId 指标id + * @return + */ + @Override + public NutMap getBzById(String peoId) { + WorkersHomeReviewPeo commentPeo = fetch(peoId); + List query = baseService.dao().query(WorkersHomeReviewResult.class, Cnd.where("peo_id","=",peoId)); + //对测评标准分组 + Map commentResultMap = query.stream().collect(Collectors.toMap(v -> v.getProxyId(), v -> v)); + //获取指标 + WorkersHomeReviewProxy khzb = commentZbService.khzb(commentPeo.getProxyId()); + List nrs = khzb.getReviewContents(); + nrs.forEach(v->{ + v.getReviewNorms().forEach(o->{ + //赋值测评结果 + WorkersHomeReviewResult result = commentResultMap.get(o.getId()); + if (Lang.isNotEmpty(result)){ + o.setOptions(StrUtil.isNotBlank(result.getRecommendation()) ? result.getRecommendation() : "未填写此项"); + o.setResultScore(result.getAssessResult()); + } + }); + }); + NutMap nutMap = new NutMap(); + nutMap.setv("zbxx",khzb); + nutMap.setv("commentPeo",commentPeo); + return nutMap; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentStatisticsServiceImpl.java new file mode 100644 index 00000000..0865dbc3 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentStatisticsServiceImpl.java @@ -0,0 +1,87 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl.review; + +import cn.hutool.core.convert.Convert; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentPeoService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentStatisticsService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; + +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @version 1.0 + * @Author zzr + * @name：CommentStatisticsServiceImpl + * @Date 2024/8/26 9:48 + * @注释 + */ +@IocBean(args = {"refer:dao"}) +public class CommentStatisticsServiceImpl extends BaseServiceImpl implements CommentStatisticsService { + public CommentStatisticsServiceImpl(Dao dao) { + super(dao); + } + + @Inject + private CommentPeoService commentPeoService; + + + @Override + public void exportWord(WorkersHomeReviewPeo peo, OutputStream outputStream) { + NutMap map = commentPeoService.getBzById(peo.getId()); + //最后的导出表 + NutMap resultMap = NutMap.NEW(); + + List list = new ArrayList<>(); +// resultMap.put("schoolName", Globals.schoolName); + + WorkersHomeReviewProxy khzb = map.getAs("zbxx", WorkersHomeReviewProxy.class); + List nrs = khzb.getReviewContents(); + + nrs.forEach(v -> { + NutMap nutMap = NutMap.NEW(); + List bzs = v.getReviewNorms(); + String nr = bzs.stream().sorted(Comparator.comparing(WorkersHomeReviewNorm::getContentNumber)).map(item -> { + return item.getContentNumber() + "." + item.getInspection() + "(" + item.getScore() + "分)"; + }).collect(Collectors.joining("\n")); + + int jf = bzs.stream().mapToInt(item -> Integer.parseInt(item.getScore())).sum(); + int zpf = bzs.stream().mapToInt(item -> Integer.parseInt(item.getResultScore())).sum(); + WorkersHomeReviewNorm commentBz = bzs.stream().findFirst().orElse(new WorkersHomeReviewNorm()); + + nutMap.put("xh", Convert.numberToChinese(Double.parseDouble(v.getContentNumber()), false)); + nutMap.put("zb", v.getContent()); + nutMap.put("nr", nr); + nutMap.put("jf", jf); + nutMap.put("zpf", zpf); + nutMap.put("bz", commentBz.getOptions()); + list.add(nutMap); + }); + +// HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); +// HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy(); +// htmlRenderPolicy.getConfig().setShowDefaultTableBorderInTableCell(true); +// +// Configure config = Configure.newBuilder().bind("list", policy) +// .bind("list.nr", htmlRenderPolicy).build(); + resultMap.put("list", list); + + try { +// InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/workershome.docx"); +// XWPFTemplate.compile(inputStream, config).render(resultMap, outputStream); +// inputStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentZbServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentZbServiceImpl.java new file mode 100644 index 00000000..c3ac2e18 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/impl/review/CommentZbServiceImpl.java @@ -0,0 +1,82 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.impl.review; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewGrading; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentNrService; +import com.budwk.app.zhgh.dayofficework.workershome.service.review.CommentZbService; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.random.R; + +import java.util.ArrayList; +import java.util.List; + +/** + * @ClassName CommentZbServiceImpl + * @Description TODO + * @Author zhf + * @Date 2023/9/4 15:54 + */ +@IocBean(args = {"refer:dao"}) +public class CommentZbServiceImpl extends BaseServiceImpl implements CommentZbService { + public CommentZbServiceImpl(Dao dao) { + super(dao); + } + + @Inject + private CommentNrService commentNrService; + + + @Override + public WorkersHomeReviewProxy khzb(String zbid) { + if (StrUtil.isBlank(zbid)) { + return null; + } + + WorkersHomeReviewProxy zb = dao().fetchLinks(fetch(zbid), "nrs", Cnd.NEW().asc("contentNumber")); + for (WorkersHomeReviewContent nr : zb.getReviewContents()) { + List query = dao().query(WorkersHomeReviewNorm.class, Cnd.where("zb_id", "=", zbid).and("nr_id", "=", nr.getId()).asc("contentNumber")); + nr.setReviewNorms(query); + } + return zb; + } + + + @Override + public void setGrading(WorkersHomeReviewProxy commentZb) { + int count = dao().count(WorkersHomeReviewGrading.class, Cnd.where("zbId", "=", commentZb.getId())); + if (count > 0) { + dao().clear(WorkersHomeReviewGrading.class, Cnd.where("zbId", "=", commentZb.getId())); + } + + if (ObjectUtil.isNotNull(commentZb.getCommentTarget()) && commentZb.getCommentTarget() != 1) { + List query = new ArrayList<>(); + if (commentZb.getCommentTarget() == 2) { + query = dao().query(Sys_union.class, Cnd.NEW()); + } else if (commentZb.getCommentTarget() == 3) { + query = dao().query(Sys_union.class, Cnd.where("id", "in", commentZb.getUnionIds())); + } + List commentUnionGradings = new ArrayList<>(); + for (Sys_union union : query) { + WorkersHomeReviewGrading unionGrading = new WorkersHomeReviewGrading(); + unionGrading.setId(R.UU32()); + unionGrading.setUnionId(union.getId()); + unionGrading.setProxyId(commentZb.getId()); + unionGrading.setUnionName(union.getName()); + unionGrading.setUnionCode(union.getUnionCode()); + unionGrading.setIsGrading(false); + unionGrading.setGradingTime(null); + commentUnionGradings.add(unionGrading); + } + dao().insert(commentUnionGradings); + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentBzService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentBzService.java new file mode 100644 index 00000000..e5d949a8 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentBzService.java @@ -0,0 +1,8 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.review; + + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; + +public interface CommentBzService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentNrService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentNrService.java new file mode 100644 index 00000000..7d8b6b6b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentNrService.java @@ -0,0 +1,8 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.review; + + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewContent; + +public interface CommentNrService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentPeoService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentPeoService.java new file mode 100644 index 00000000..94ccece5 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentPeoService.java @@ -0,0 +1,16 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.review; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; +import org.nutz.lang.util.NutMap; + +public interface CommentPeoService extends BaseService { + + /** + * 根据指标id和被测评人id查测评结果 + * @param peoId 指标id + * @return + */ + NutMap getBzById(String peoId); + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentStatisticsService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentStatisticsService.java new file mode 100644 index 00000000..6374b0dc --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentStatisticsService.java @@ -0,0 +1,22 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.review; + + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewPeo; + +import java.io.OutputStream; + +/** + * @version 1.0 + * @Author zzr + * @name：CommentStatisticsService + * @Date 2024/8/26 9:47 + * @注释 + */ +public interface CommentStatisticsService extends BaseService { + + void exportWord(WorkersHomeReviewPeo peo, OutputStream outputStream); + + + +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentZbService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentZbService.java new file mode 100644 index 00000000..d5d67c5a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/service/review/CommentZbService.java @@ -0,0 +1,13 @@ +package com.budwk.app.zhgh.dayofficework.workershome.service.review; + + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewProxy; + +public interface CommentZbService extends BaseService { + + + WorkersHomeReviewProxy khzb(String zbid); + + void setGrading(WorkersHomeReviewProxy zb); +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/vo/WakesHomeVo.java b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/vo/WakesHomeVo.java new file mode 100644 index 00000000..9cb98d7f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/workershome/vo/WakesHomeVo.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.dayofficework.workershome.vo; + +import cn.hutool.json.JSONObject; +import com.budwk.app.zhgh.dayofficework.workershome.model.review.WorkersHomeReviewNorm; +import lombok.Data; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：WakesHomeVo + * @Date 2024/8/1 16:06 + * @注释 职工建家vo + */ +@Data +public class WakesHomeVo { + + private String id; + + private List bzList; + + private String reviewResult; + + private String evaluatedPersonId; + + private String evaluatedPersonName; + + private String evaluatedPersonType; + + private String presidentOpinions; + + private List files; +} diff --git a/src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java b/src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java index 60ba60e4..086aa2b2 100644 --- a/src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java +++ b/src/main/java/com/budwk/app/zhgh/integral/model/IntegralDetail.java @@ -25,7 +25,6 @@ public class IntegralDetail extends BaseModel implements Serializable { @Name @Comment("id") @ColDefine(type = ColType.VARCHAR, width = 32) - @Prev(els = {@EL("uuid()")}) private String id; @Column diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/dto/GoodsDTO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/dto/GoodsDTO.java new file mode 100644 index 00000000..74d6b9e6 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/dto/GoodsDTO.java @@ -0,0 +1,187 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.dto; + +import com.budwk.app.zhgh.mall.manage.models.goods.entity.GoodsGalleryDO; +import com.budwk.app.zhgh.mall.manage.models.goods.entity.GoodsParamsDO; +import com.budwk.app.zhgh.mall.manage.models.goods.vo.ExchangeVO; +import com.budwk.app.zhgh.mall.manage.models.goods.vo.GoodsMobileIntroVO; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; + +import javax.validation.Valid; +import javax.validation.constraints.*; +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * 商品vo + * + * @author fk + * @version v2.0 + * @since v7.0.0 + * 2018年3月21日 上午11:25:10 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 3922135264669953741L; + + @ApiModelProperty("商品id") + private Long goodsId; + + @ApiModelProperty("分类id") + private Long categoryId; + + /** + * 用作显示 + */ + @ApiModelProperty("分类名称") + private String categoryName; + + @ApiModelProperty("店铺分类id") + @Min(value = 0, message = "店铺分类值不正确") + private Long shopCatId; + + @ApiModelProperty("品牌id") + private Long brandId; + + @ApiModelProperty("商品名称") + @NotEmpty(message = "商品名称不能为空") + private String goodsName; + + @ApiModelProperty("商品编号") + @Length(max = 30,message = "商品编号太长，不能超过30个字符") + private String sn; + + @ApiModelProperty("商品价格") + @NotNull(message = "商品价格不能为空") + @Min(value = 0, message = "商品价格不能为负数") + @Max(value = 99999999, message = "商品价格不能超过99999999") + private Double price; + + @ApiModelProperty("成本价格") + @NotNull(message = "成本价格不能为空") + @Min(value = 0, message = "成本价格不能为负数") + @Max(value = 99999999, message = "成本价格不能超过99999999") + private Double cost; + + @ApiModelProperty("市场价格") + @NotNull(message = "市场价格不能为空") + @Min(value = 0, message = "市场价格不能为负数") + @Max(value = 99999999, message = "市场价格不能超过99999999") + private Double mktprice; + + @ApiModelProperty("重量") + @NotNull(message = "商品重量不能为空") + @Min(value = 0, message = "重量不能为负数") + @Max(value = 99999999,message = "重量不能超过99999999") + private Double weight; + + @ApiModelProperty("谁承担运费0：买家承担，1：卖家承担") + @NotNull(message = "承担运费不能为空") + @Min(value = 0, message = "承担运费值不正确") + @Max(value = 1, message = "承担运费值不正确") + private Integer goodsTransfeeCharge; + + @ApiModelProperty("详情") + private String intro; + + @ApiModelProperty("是否有规格0没有1有") + private Integer haveSpec; + + @ApiModelProperty("库存") + @Max(value = 99999999, message = "库存不能超过99999999") + private Integer quantity; + + @ApiModelProperty("是否上架，1上架 0下架") + @Min(value = 0, message = "是否上架值不正确") + @Max(value = 1, message = "是否上架值不正确") + private Integer marketEnable; + + @ApiModelProperty("商品参数") + @Valid + private List goodsParamsList; + + @ApiModelProperty("商品相册") + @NotNull(message = "商品相册图片不能为空") + @Size(min = 1,message = "商品相册图片不能为空") + private List goodsGalleryList; + + @ApiModelProperty("积分兑换对象，不是积分兑换商品可以不传") + private ExchangeVO exchange; + + @ApiModelProperty("sku数据变化或者组合变化判断 0:没变化，1：变化") + private Integer hasChanged; + + @ApiModelProperty("seo标题") + private String pageTitle; + + @ApiModelProperty("seo关键字") + private String metaKeywords; + + @ApiModelProperty("seo描述") + private String metaDescription; + + @ApiModelProperty("商品的评论数量") + private Integer commentNum; + + @ApiModelProperty("运费模板id,不需要运费模板时值是0") + private Long templateId; + + @ApiModelProperty("商品是否审核") + private Integer isAuth; + + @ApiModelProperty("可用库存") + private Integer enableQuantity; + + @ApiModelProperty("商品移动端详情数据集合") + private List introList; + + @ApiModelProperty("商品视频") + private String goodsVideo; + + @Override + public String toString() { + return "GoodsDTO{" + + "goodsId=" + goodsId + + ", categoryId=" + categoryId + + ", categoryName='" + categoryName + '\'' + + ", shopCatId=" + shopCatId + + ", brandId=" + brandId + + ", goodsName='" + goodsName + '\'' + + ", sn='" + sn + '\'' + + ", price=" + price + + ", cost=" + cost + + ", mktprice=" + mktprice + + ", weight=" + weight + + ", goodsTransfeeCharge=" + goodsTransfeeCharge + + ", intro='" + intro + '\'' + + ", haveSpec=" + haveSpec + + ", quantity=" + quantity + + ", marketEnable=" + marketEnable + + ", goodsParamsList=" + goodsParamsList + + ", goodsGalleryList=" + goodsGalleryList + + ", exchange=" + exchange + + ", hasChanged=" + hasChanged + + ", pageTitle='" + pageTitle + '\'' + + ", metaKeywords='" + metaKeywords + '\'' + + ", metaDescription='" + metaDescription + '\'' + + ", commentNum=" + commentNum + + ", templateId=" + templateId + + ", isAuth=" + isAuth + + ", enableQuantity=" + enableQuantity + + ", introList=" + introList + + ", goodsVideo='" + goodsVideo + '\'' + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/BrandDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/BrandDO.java new file mode 100644 index 00000000..d4f84cfe --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/BrandDO.java @@ -0,0 +1,64 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 品牌实体 + * + * @author fky + * + */ +@Data +@Table("mall_brand") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class BrandDO implements Serializable { + + @Serial + private static final long serialVersionUID = 9122931201151887L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long brandId; + + /** + * 品牌名称 + */ + @Column + @Comment("品牌名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String name; + + /** + * 品牌图标 + */ + @Column + @Comment("品牌图标") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String logo; + + /** + * 是否删除，0删除1未删除 + */ + @Column + @Comment("是否删除") + @ColDefine(type = ColType.INT) + private Integer disabled; + + @Override + public String toString() { + return "[brandId=" + brandId + ", name=" + name + ", logo=" + logo + ", disabled=" + disabled + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategoryBrandDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategoryBrandDO.java new file mode 100644 index 00000000..29f544b1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategoryBrandDO.java @@ -0,0 +1,66 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 分类品牌关联表实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Comment("分类品牌关联表实体") +@Table("mall_category_brand") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class CategoryBrandDO implements Serializable { + + @Serial + private static final long serialVersionUID = 3315719881926878L; + /** + * 分类id + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long id; + + /** + * 分类id + */ + @Column + @Comment("分类id") + @ColDefine(customType = "bigint") + private Long categoryId; + + /** + * 品牌id + */ + @Column + @Comment("品牌id") + @ColDefine(customType = "bigint") + private Long brandId; + + public CategoryBrandDO(Long categoryId, Long brandId) { + super(); + this.categoryId = categoryId; + this.brandId = brandId; + } + + @Override + public String toString() { + return "CategoryBrandDO [categoryId=" + categoryId + ", brandId=" + brandId + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategoryDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategoryDO.java new file mode 100644 index 00000000..f10bbd51 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategoryDO.java @@ -0,0 +1,151 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import org.nutz.dao.entity.annotation.*; + +import javax.validation.constraints.NotEmpty; +import java.io.Serial; +import java.io.Serializable; +import java.util.Objects; + + +/** + * 商品分类实体 + * + * @author fky + * + */ +@Data +@Comment("商品分类实体") +@Table("mall_category") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class CategoryDO implements Serializable { + + @Serial + private static final long serialVersionUID = 1964321416223565L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long categoryId; + + /** + * 分类名称 + */ + @Column + @Comment("分类名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String name; + + /** + * 分类父id + */ + @Column + @Comment("分类父id，顶级0") + @ColDefine(customType = "bigint") + private Long parentId; + + /** + * 分类父子路径 + */ + @Column + @Comment("分类父子路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String categoryPath; + + /** + * 该分类下商品数量 + */ + @Column + @Comment("该分类下商品数量") + @ColDefine(type = ColType.INT) + private Integer goodsCount; + + /** + * 分类排序 + */ + @Column + @Comment("分类排序") + @ColDefine(type = ColType.INT) + private Integer categoryOrder; + + /** + * 分类图标 + */ + @Column + @Comment("分类图标") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String image; + + /** + * 是否显示 YES：是，NO：否 + */ + @Column + @Comment("是否显示 YES：是，NO：否") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String isShow; + + /** + * 分类广告图片 + */ + @Column + @Comment("分类广告图片") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String advImage; + + /** + * 分类广告图片链接 + */ + @Column + @Comment("分类广告图片链接") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String advImageLink; + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + CategoryDO that = (CategoryDO) o; + return Objects.equals(categoryId, that.categoryId) && + Objects.equals(name, that.name) && + Objects.equals(parentId, that.parentId) && + Objects.equals(categoryPath, that.categoryPath) && + Objects.equals(goodsCount, that.goodsCount) && + Objects.equals(categoryOrder, that.categoryOrder) && + Objects.equals(image, that.image) && + Objects.equals(isShow, that.isShow) && + Objects.equals(advImage, that.advImage) && + Objects.equals(advImageLink, that.advImageLink); + } + + @Override + public int hashCode() { + return Objects.hash(categoryId, name, parentId, categoryPath, goodsCount, categoryOrder, image, isShow, advImage, advImageLink); + } + + @Override + public String toString() { + return "CategoryDO{" + + "categoryId=" + categoryId + + ", name='" + name + '\'' + + ", parentId=" + parentId + + ", categoryPath='" + categoryPath + '\'' + + ", goodsCount=" + goodsCount + + ", categoryOrder=" + categoryOrder + + ", image='" + image + '\'' + + ", isShow='" + isShow + '\'' + + ", advImage='" + advImage + '\'' + + ", advImageLink='" + advImageLink + '\'' + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategorySpecDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategorySpecDO.java new file mode 100644 index 00000000..0c4c2fd5 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/CategorySpecDO.java @@ -0,0 +1,63 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 分类规格关联表实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_category_spec") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class CategorySpecDO implements Serializable { + + @Serial + private static final long serialVersionUID = 3127259064985991L; + + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long id; + + /** + * 分类id + */ + @Column + @Comment("分类id") + @ColDefine(customType = "bigint") + private Long categoryId; + + /** + * 规格id + */ + @Column + @Comment("规格id") + @ColDefine(customType = "bigint") + private Long specId; + + public CategorySpecDO(Long categoryId, Long specId) { + super(); + this.categoryId = categoryId; + this.specId = specId; + } + + @Override + public String toString() { + return "CategorySpecDO [categoryId=" + categoryId + ", specId=" + specId + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsDO.java new file mode 100644 index 00000000..b49d41e2 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsDO.java @@ -0,0 +1,307 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import cn.hutool.json.JSONUtil; +import com.budwk.app.zhgh.mall.manage.models.goods.dto.GoodsDTO; +import com.budwk.app.zhgh.mall.manage.models.goods.enums.GoodsType; +import com.budwk.app.zhgh.mall.manage.models.goods.vo.GoodsMobileIntroVO; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serializable; +import java.util.List; + +/** + * 草稿商品实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_draft_goods") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class DraftGoodsDO implements Serializable { + + private static final long serialVersionUID = 7646662730625878L; + + /** + * 草稿商品id + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long draftGoodsId; + /** + * 商品编号 + */ + @Column + @Comment("商品编号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String sn; + /** + * 商品名称 + */ + @Column + @Comment("商品名称") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String goodsName; + /** + * 商品品牌ID + */ + @Column + @Comment("商品品牌ID") + @ColDefine(customType = "bigint") + private Long brandId; + /** + * 商品分类ID + */ + @Column + @Comment("商品分类ID") + @ColDefine(customType = "bigint") + private Long categoryId; + /** + * 商品重量 + */ + @Column + @Comment("商品重量") + @ColDefine(type = ColType.DOUBLE) + private Double weight; + /** + * 商品详情 + */ + @Column + @Comment("商品详情") + @ColDefine(type = ColType.MYSQL_JSON) + private String intro; + /** + * 商品价格 + */ + @Column + @Comment("商品价格") + @ColDefine(type = ColType.DOUBLE) + private Double price; + /** + * 商品成本价 + */ + @Column + @Comment("商品成本价") + @ColDefine(type = ColType.DOUBLE) + private Double cost; + /** + * 商品市场价 + */ + @Column + @Comment("商品市场价") + @ColDefine(type = ColType.DOUBLE) + private Double mktprice; + /** + * 商品类型 + */ + @Column + @Comment("商品类型") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String goodsType; + /** + * 是否开启规格 + */ + @Column + @Comment("是否开启规格") + @ColDefine(type = ColType.INT) + private Integer haveSpec; + /** + * 商品添加时间 + */ + @Column + @Comment("商品添加时间") + @ColDefine(customType = "bigint") + private Long createTime; + /** + * 商品总库存 + */ + @Column + @Comment("商品总库存") + @ColDefine(type = ColType.INT) + private Integer quantity; + /** + * 商品原始图片 + */ + @Column + @Comment("商品原始图片") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String original; + /** + * 商品所属卖家ID + */ + @Column + @Comment("商品所属卖家ID") + @ColDefine(customType = "bigint") + private Long sellerId; + /** + * 商品所属店铺类目ID + */ + @Column + @Comment("商品所属店铺类目ID") + @ColDefine(customType = "bigint") + private Long shopCatId; + /** + * 商品运费模板ID + */ + @Column + @Comment("商品运费模板ID") + @ColDefine(customType = "bigint") + private Long templateId; + /** + * 是否为买家承担运费 + */ + @Column + @Comment("是否为买家承担运费") + @ColDefine(type = ColType.INT) + private Integer goodsTransfeeCharge; + /** + * 商品所属店铺名称 + */ + @Column + @Comment("商品所属店铺名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sellerName; + /** + * seo 标题 + */ + @Column + @Comment("seo 标题") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String pageTitle; + /** + * seo关键字 + */ + @Column + @Comment("seo关键字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String metaKeywords; + /** + * seo描述 + */ + @Column + @Comment("seo描述") + @ColDefine(type = ColType.MYSQL_JSON) + private String metaDescription; + /** + * 积分商品需要的金额 + */ + @Column + @Comment("积分商品需要的金额") + @ColDefine(type = ColType.DOUBLE) + private Double exchangeMoney; + /** + * 积分商品需要的积分 + */ + @Column + @Comment("积分商品需要的积分") + @ColDefine(type = ColType.INT) + private Integer exchangePoint; + /** + * 积分商品的分类id + */ + @Column + @Comment("积分商品的分类id") + @ColDefine(customType = "bigint") + private Long exchangeCategoryId; + + /** + * 商品移动端详情 + */ + @Column + @Comment("商品移动端详情") + @ColDefine(type = ColType.MYSQL_JSON) + private String mobileIntro; + + /** + * 商品视频 + */ + @Column + @Comment("商品视频") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String goodsVideo; + + private List galleryList; + + public DraftGoodsDO(GoodsDTO goodsVO) { + + this.draftGoodsId = goodsVO.getGoodsId(); + this.categoryId = goodsVO.getCategoryId(); + this.shopCatId = goodsVO.getShopCatId(); + this.brandId = goodsVO.getBrandId(); + this.goodsName = goodsVO.getGoodsName(); + this.sn = goodsVO.getSn(); + this.price = goodsVO.getPrice() == null ? 0 : goodsVO.getPrice(); + this.cost = goodsVO.getCost() == null ? 0 : goodsVO.getCost(); + this.mktprice = goodsVO.getMktprice() == null ? 0 : goodsVO.getMktprice(); + this.weight = goodsVO.getWeight() == null ? 0 : goodsVO.getWeight(); + this.goodsTransfeeCharge = goodsVO.getGoodsTransfeeCharge(); + this.intro = goodsVO.getIntro(); + this.haveSpec = goodsVO.getHaveSpec(); + if (goodsVO.getExchange() != null && goodsVO.getExchange().getEnableExchange() == 1) { + this.goodsType = GoodsType.POINT.name(); + this.exchangeMoney = goodsVO.getExchange().getExchangeMoney(); + this.exchangePoint = goodsVO.getExchange().getExchangePoint(); + this.exchangeCategoryId = goodsVO.getExchange().getCategoryId(); + } else { + this.goodsType = GoodsType.NORMAL.name(); + this.exchangeMoney = 0.00; + this.exchangePoint = 0; + this.exchangeCategoryId = 1L; + } + this.pageTitle = goodsVO.getPageTitle(); + this.metaKeywords = goodsVO.getMetaKeywords(); + this.metaDescription = goodsVO.getMetaDescription(); + this.templateId = goodsVO.getTemplateId(); + + List introList = goodsVO.getIntroList(); + if (introList != null && !introList.isEmpty()) { + this.mobileIntro = JSONUtil.toJsonStr(introList); + } + + this.goodsVideo = goodsVO.getGoodsVideo(); + } + + @Override + public String toString() { + return "DraftGoodsDO{" + + "draftGoodsId=" + draftGoodsId + + ", sn='" + sn + '\'' + + ", goodsName='" + goodsName + '\'' + + ", brandId=" + brandId + + ", categoryId=" + categoryId + + ", weight=" + weight + + ", intro='" + intro + '\'' + + ", price=" + price + + ", cost=" + cost + + ", mktprice=" + mktprice + + ", goodsType='" + goodsType + '\'' + + ", haveSpec=" + haveSpec + + ", createTime=" + createTime + + ", quantity=" + quantity + + ", original='" + original + '\'' + + ", sellerId=" + sellerId + + ", shopCatId=" + shopCatId + + ", templateId=" + templateId + + ", goodsTransfeeCharge=" + goodsTransfeeCharge + + ", sellerName='" + sellerName + '\'' + + ", pageTitle='" + pageTitle + '\'' + + ", metaKeywords='" + metaKeywords + '\'' + + ", metaDescription='" + metaDescription + '\'' + + ", exchangeMoney=" + exchangeMoney + + ", exchangePoint=" + exchangePoint + + ", exchangeCategoryId=" + exchangeCategoryId + + ", mobileIntro='" + mobileIntro + '\'' + + ", goodsVideo='" + goodsVideo + '\'' + + ", galleryList=" + galleryList + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsParamsDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsParamsDO.java new file mode 100644 index 00000000..3995d152 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsParamsDO.java @@ -0,0 +1,80 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 草稿商品参数表实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_draft_goods_params") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class DraftGoodsParamsDO implements Serializable { + + @Serial + private static final long serialVersionUID = 1137617128769441L; + + /** + * ID + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long id; + /** + * 草稿ID + */ + @Column + @Comment("草稿id") + @ColDefine(customType = "bigint") + private Long draftGoodsId; + /** + * 参数ID + */ + @Column + @Comment("参数id") + @ColDefine(customType = "bigint") + private Long paramId; + /** + * 参数名 + */ + @Column + @Comment("参数名") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String paramName; + /** + * 参数值 + */ + @Column + @Comment("参数值") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String paramValue; + + public DraftGoodsParamsDO(GoodsParamsDO param) { + this.paramId = param.getParamId(); + this.paramName = param.getParamName(); + this.paramValue = param.getParamValue(); + } + + @Override + public String toString() { + return "DraftGoodsParamsDO [id=" + id + ", draftGoodsId=" + draftGoodsId + ", paramId=" + paramId + + ", paramName=" + paramName + ", paramValue=" + paramValue + "]"; + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsSkuDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsSkuDO.java new file mode 100644 index 00000000..fee17a1c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/DraftGoodsSkuDO.java @@ -0,0 +1,106 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.budwk.app.zhgh.mall.manage.models.goods.vo.GoodsSkuVO; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 草稿商品sku实体 + * + * @author fky + * + */ +@Data +@Table("mall_draft_goods_sku") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class DraftGoodsSkuDO implements Serializable { + + @Serial + private static final long serialVersionUID = 5684194304207265L; + + /** + * 主键ID + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long draftSkuId; + /** + * 草稿id + */ + @Column + @Comment("草稿id") + @ColDefine(customType = "bigint") + private Long draftGoodsId; + /** + * 货号 + */ + @Column + @Comment("货号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String sn; + /** + * 总库存 + */ + @Column + @Comment("货号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private Integer quantity; + /** + * 价格 + */ + @Column + @Comment("货号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private Double price; + /** + * 规格 + */ + @Column + @Comment("货号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String specs; + /** + * 成本 + */ + @Column + @Comment("货号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private Double cost; + /** + * 重量 + */ + @Column + @Comment("货号") + @ColDefine(type = ColType.VARCHAR, width = 50) + private Double weight; + + public DraftGoodsSkuDO() { + } + + public DraftGoodsSkuDO(GoodsSkuVO skuVO) { + this.setDraftGoodsId(skuVO.getGoodsId()); + this.setSn(skuVO.getSn()); + this.setPrice(skuVO.getPrice()); + this.setCost(skuVO.getCost()); + this.setWeight(skuVO.getWeight()); + this.setQuantity(skuVO.getQuantity()); + this.setSpecs(skuVO.getSpecs()); + } + + @Override + public String toString() { + return "DraftGoodsSkuDO [draftSkuId=" + draftSkuId + ", draftGoodsId=" + draftGoodsId + ", sn=" + sn + + ", quantity=" + quantity + ", price=" + price + ", specs=" + specs + ", cost=" + cost + ", weight=" + + weight + "]"; + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsDO.java new file mode 100644 index 00000000..ab8ed26b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsDO.java @@ -0,0 +1,481 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.budwk.app.zhgh.mall.manage.models.goods.dto.GoodsDTO; +import com.budwk.app.zhgh.mall.manage.models.goods.vo.GoodsMobileIntroVO; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; +import java.util.Objects; + +/** + * 商品实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_goods") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsDO implements Serializable { + + @Serial + private static final long serialVersionUID = 9115135430405642L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long goodsId; + /** + * 商品名称 + */ + @Column + @Comment("商品名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String goodsName; + /** + * 商品编号 + */ + @Column + @Comment("商品编号") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sn; + /** + * 品牌id + */ + @Column + @Comment("品牌id") + @ColDefine(customType = "bigint") + private Long brandId; + /** + * 分类id + */ + @Column + @Comment("分类id") + @ColDefine(customType = "bigint") + private Long categoryId; + /** + * 商品类型normal普通point积分 + */ + @Column + @Comment("商品类型NORMAL普通POINT积分") + @ColDefine(type = ColType.VARCHAR, width = 120) + private String goodsType; + /** + * 重量 + */ + @Column + @Comment("重量") + @ColDefine(type = ColType.DOUBLE) + private Double weight; + /** + * 上架状态 1上架 0下架 + */ + @Column + @Comment("上架状态 1上架 0下架") + @ColDefine(type = ColType.INT) + private Integer marketEnable; + /** + * 详情 + */ + @Column + @Comment("详情") + @ColDefine(type = ColType.MYSQL_JSON) + private String intro; + /** + * 商品价格 + */ + @Column + @Comment("商品价格") + @ColDefine(type = ColType.DOUBLE) + private Double price; + /** + * 成本价格 + */ + @Column + @Comment("成本价格") + @ColDefine(type = ColType.DOUBLE) + private Double cost; + /** + * 市场价格 + */ + @Column + @Comment("市场价格") + @ColDefine(type = ColType.DOUBLE) + private Double mktprice; + /** + * 是否有规格0没有 1有 + */ + @Column + @Comment("是否有规格0没有 1有") + @ColDefine(type = ColType.INT) + private Integer haveSpec; + /** + * 创建时间 + */ + @Column + @Comment("创建时间") + @ColDefine(customType = "bigint") + private Long createTime; + /** + * 最后修改时间 + */ + @Column + @Comment("最后修改时间") + @ColDefine(customType = "bigint") + private Long lastModify; + /** + * 浏览数量 + */ + @Column + @Comment("浏览数量") + @ColDefine(type = ColType.INT) + private Integer viewCount; + /** + * 购买数量 + */ + @Column + @Comment("购买数量") + @ColDefine(type = ColType.INT) + private Integer buyCount; + /** + * 是否被删除0 删除 1未删除 + */ + @Column + @Comment("是否被删除0 删除 1未删除") + @ColDefine(type = ColType.INT) + private Integer disabled; + /** + * 库存 + */ + @Column + @Comment("库存") + @ColDefine(type = ColType.INT) + private Integer quantity; + /** + * 可用库存 + */ + @Column + @Comment("可用库存") + @ColDefine(type = ColType.INT) + private Integer enableQuantity; + /** + * 如果是积分商品需要使用的积分 + */ + @Column + @Comment("如果是积分商品需要使用的积分") + @ColDefine(type = ColType.INT) + private Integer point; + /** + * seo标题 + */ + @Column + @Comment("seo标题") + @ColDefine(type = ColType.VARCHAR, width = 120) + private String pageTitle; + /** + * seo关键字 + */ + @Column + @Comment("seo关键字") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String metaKeywords; + /** + * seo描述 + */ + @Column + @Comment("seo描述") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String metaDescription; + /** + * 商品好评率 + */ + @Column + @Comment("商品好评率") + @ColDefine(type = ColType.DOUBLE) + private Double grade; + /** + * 缩略图路径 + */ + @Column + @Comment("缩略图路径") + @ColDefine(type = ColType.VARCHAR, width = 120) + private String thumbnail; + /** + * 大图路径 + */ + @Column + @Comment("大图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String big; + /** + * 小图路径 + */ + @Column + @Comment("小图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String small; + /** + * 原图路径 + */ + @Column + @Comment("原图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String original; + /** + * 卖家id + */ + @Column + @Comment("卖家id") + @ColDefine(customType = "bigint") + private Long sellerId; + /** + * 店铺分类id + */ + @Column + @Comment("店铺分类id") + @ColDefine(customType = "bigint") + private Long shopCatId; + /** + * 评论数量 + */ + @Column + @Comment("评论数量") + @ColDefine(type = ColType.INT) + private Integer commentNum; + /** + * 运费模板id + */ + @Column + @Comment("运费模板id") + @ColDefine(customType = "bigint") + private Long templateId; + /** + * 谁承担运费0：买家承担，1：卖家承担 + */ + @Column + @Comment("谁承担运费0：买家承担，1：卖家承担") + @ColDefine(type = ColType.INT) + private Integer goodsTransfeeCharge; + /** + * 卖家名字 + */ + @Column + @Comment("卖家名字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sellerName; + /** + * 0 需要审核 并且待审核，1 不需要审核 2需要审核 且审核通过 3 需要审核 且审核未通过 + */ + @Column + @Comment("0 待审核，1 审核通过 2 未通过") + @ColDefine(type = ColType.INT) + private Integer isAuth; + /** + * 审核信息 + */ + @Column + @Comment("审核信息") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String authMessage; + + /** + * 下架原因 + */ + @Column + @Comment("下架原因") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String underMessage; + + @Column + @Comment("是否自营0否 1是") + @ColDefine(type = ColType.INT) + private Integer selfOperated; + + /** + * 商品移动端详情 + */ + @Column + @Comment("商品移动端详情") + @ColDefine(type = ColType.MYSQL_JSON) + private String mobileIntro; + + /** + * 商品视频 + */ + @Column + @Comment("商品视频") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String goodsVideo; + + /** + * 搜索优先级 + */ + @Column + @Comment("搜索优先级") + @ColDefine(type = ColType.INT) + private Integer priority; + + @JsonIgnore + protected String scanRounds; + + public GoodsDO(GoodsDTO goodsVO) { + this.goodsId = goodsVO.getGoodsId(); + this.categoryId = goodsVO.getCategoryId(); + this.shopCatId = goodsVO.getShopCatId(); + this.brandId = goodsVO.getBrandId(); + this.goodsName = goodsVO.getGoodsName(); + this.sn = goodsVO.getSn(); + this.price = goodsVO.getPrice(); + this.cost = goodsVO.getCost(); + this.mktprice = goodsVO.getMktprice(); + this.weight = goodsVO.getWeight(); + this.goodsTransfeeCharge = goodsVO.getGoodsTransfeeCharge(); + this.intro = goodsVO.getIntro(); + this.haveSpec = goodsVO.getHaveSpec(); + this.templateId = goodsVO.getTemplateId(); + this.pageTitle = goodsVO.getPageTitle(); + this.metaKeywords = goodsVO.getMetaKeywords(); + this.metaDescription = goodsVO.getMetaDescription(); + this.marketEnable = goodsVO.getMarketEnable() != 1 ? 0 : 1; + + if (StrUtil.isNotBlank(this.pageTitle)) { + this.pageTitle = goodsVO.getGoodsName(); + } + if (StrUtil.isNotBlank(this.metaKeywords)) { + this.metaKeywords = goodsVO.getGoodsName(); + } + if (StrUtil.isNotBlank(this.metaDescription)) { + this.metaDescription = goodsVO.getGoodsName(); + } + + List introList = goodsVO.getIntroList(); + if (introList != null && introList.size() != 0) { + this.mobileIntro = JSONUtil.toJsonStr(introList); + } else { + this.mobileIntro = ""; + } + + this.goodsVideo = goodsVO.getGoodsVideo(); + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + GoodsDO goodsDO = (GoodsDO) o; + return Objects.equals(goodsId, goodsDO.goodsId) && + Objects.equals(goodsName, goodsDO.goodsName) && + Objects.equals(sn, goodsDO.sn) && + Objects.equals(brandId, goodsDO.brandId) && + Objects.equals(categoryId, goodsDO.categoryId) && + Objects.equals(goodsType, goodsDO.goodsType) && + Objects.equals(weight, goodsDO.weight) && + Objects.equals(marketEnable, goodsDO.marketEnable) && + Objects.equals(intro, goodsDO.intro) && + Objects.equals(price, goodsDO.price) && + Objects.equals(cost, goodsDO.cost) && + Objects.equals(mktprice, goodsDO.mktprice) && + Objects.equals(haveSpec, goodsDO.haveSpec) && + Objects.equals(createTime, goodsDO.createTime) && + Objects.equals(lastModify, goodsDO.lastModify) && + Objects.equals(viewCount, goodsDO.viewCount) && + Objects.equals(buyCount, goodsDO.buyCount) && + Objects.equals(disabled, goodsDO.disabled) && + Objects.equals(quantity, goodsDO.quantity) && + Objects.equals(enableQuantity, goodsDO.enableQuantity) && + Objects.equals(point, goodsDO.point) && + Objects.equals(pageTitle, goodsDO.pageTitle) && + Objects.equals(metaKeywords, goodsDO.metaKeywords) && + Objects.equals(metaDescription, goodsDO.metaDescription) && + Objects.equals(grade, goodsDO.grade) && + Objects.equals(thumbnail, goodsDO.thumbnail) && + Objects.equals(big, goodsDO.big) && + Objects.equals(small, goodsDO.small) && + Objects.equals(original, goodsDO.original) && + Objects.equals(sellerId, goodsDO.sellerId) && + Objects.equals(shopCatId, goodsDO.shopCatId) && + Objects.equals(commentNum, goodsDO.commentNum) && + Objects.equals(templateId, goodsDO.templateId) && + Objects.equals(goodsTransfeeCharge, goodsDO.goodsTransfeeCharge) && + Objects.equals(sellerName, goodsDO.sellerName) && + Objects.equals(isAuth, goodsDO.isAuth) && + Objects.equals(authMessage, goodsDO.authMessage) && + Objects.equals(underMessage, goodsDO.underMessage) && + Objects.equals(selfOperated, goodsDO.selfOperated) && + Objects.equals(mobileIntro, goodsDO.mobileIntro) && + Objects.equals(goodsVideo, goodsDO.goodsVideo); + } + + @Override + public int hashCode() { + return Objects.hash(goodsId, goodsName, sn, brandId, categoryId, goodsType, weight, marketEnable, intro, price, cost, mktprice, haveSpec, createTime, lastModify, viewCount, buyCount, disabled, quantity, enableQuantity, point, pageTitle, metaKeywords, metaDescription, grade, thumbnail, big, small, original, sellerId, shopCatId, commentNum, templateId, goodsTransfeeCharge, sellerName, isAuth, authMessage, underMessage, selfOperated, mobileIntro, goodsVideo); + } + + @Override + public String toString() { + return "GoodsDO{" + + "goodsId=" + goodsId + + ", goodsName='" + goodsName + '\'' + + ", sn='" + sn + '\'' + + ", brandId=" + brandId + + ", categoryId=" + categoryId + + ", goodsType='" + goodsType + '\'' + + ", weight=" + weight + + ", marketEnable=" + marketEnable + + ", intro='" + intro + '\'' + + ", price=" + price + + ", cost=" + cost + + ", mktprice=" + mktprice + + ", haveSpec=" + haveSpec + + ", createTime=" + createTime + + ", lastModify=" + lastModify + + ", viewCount=" + viewCount + + ", buyCount=" + buyCount + + ", disabled=" + disabled + + ", quantity=" + quantity + + ", enableQuantity=" + enableQuantity + + ", point=" + point + + ", pageTitle='" + pageTitle + '\'' + + ", metaKeywords='" + metaKeywords + '\'' + + ", metaDescription='" + metaDescription + '\'' + + ", grade=" + grade + + ", thumbnail='" + thumbnail + '\'' + + ", big='" + big + '\'' + + ", small='" + small + '\'' + + ", original='" + original + '\'' + + ", sellerId=" + sellerId + + ", shopCatId=" + shopCatId + + ", commentNum=" + commentNum + + ", templateId=" + templateId + + ", goodsTransfeeCharge=" + goodsTransfeeCharge + + ", sellerName='" + sellerName + '\'' + + ", isAuth=" + isAuth + + ", authMessage='" + authMessage + '\'' + + ", underMessage='" + underMessage + '\'' + + ", selfOperated=" + selfOperated + + ", mobileIntro='" + mobileIntro + '\'' + + ", goodsVideo='" + goodsVideo + '\'' + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsGalleryDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsGalleryDO.java new file mode 100644 index 00000000..90ca2bc1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsGalleryDO.java @@ -0,0 +1,101 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serializable; + + +/** + * 商品相册实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_goods_gallery") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsGalleryDO implements Serializable { + + private static final long serialVersionUID = 8150217189133447L; + + /** + * 主键 + */ + @Id + @Column + @Comment("图片的主键id") + @ColDefine(customType = "bigint") + private Long imgId; + /** + * 商品主键 + */ + @Column + @Comment("商品主键") + @ColDefine(customType = "bigint") + private Long goodsId; + /** + * 缩略图路径 + */ + @Column + @Comment("缩略图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String thumbnail; + /** + * 小图路径 + */ + @Column + @Comment("小图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String small; + /** + * 大图路径 + */ + @Column + @Comment("大图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String big; + /** + * 原图路径 + */ + @Column + @Comment("原图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String original; + /** + * 极小图路径 + */ + @Column + @Comment("极小图路径") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String tiny; + /** + * 是否是默认图片1 0没有默认 + */ + @Column + @Comment("是否是默认图片1 0没有默认") + @ColDefine(type = ColType.INT) + private Integer isdefault; + /** + * 排序 + */ + @Column + @Comment("排序") + @ColDefine(type = ColType.INT) + private Integer sort; + + @Override + public String toString() { + return "GoodsGalleryDO [imgId=" + imgId + ", goodsId=" + goodsId + ", thumbnail=" + thumbnail + ", small=" + + small + ", big=" + big + ", original=" + original + ", tiny=" + tiny + ", isdefault=" + isdefault + + ", sort=" + sort + "]"; + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsParamsDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsParamsDO.java new file mode 100644 index 00000000..26edef80 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsParamsDO.java @@ -0,0 +1,79 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serializable; + + +/** + * 商品关联参数值实体 + * + * @author fky + * + */ +@Data +@Table("mall_goods_params") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsParamsDO implements Serializable { + + private static final long serialVersionUID = 4134870721776090L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long id; + /** + * 商品id + */ + @Column + @Comment("商品id") + @ColDefine(customType = "bigint") + private Long goodsId; + /** + * 参数id + */ + @Column + @Comment("参数id") + @ColDefine(customType = "bigint") + private Long paramId; + /** + * 参数名字 + */ + @Column + @Comment("参数名字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String paramName; + /** + * 参数值 + */ + @Column + @Comment("参数值") + @ColDefine(type = ColType.VARCHAR, width = 120) + @Length(max = 100, message = "参数值字符不能大于120") + private String paramValue; + + + public String getParamValue() { + if (StrUtil.isNotBlank(paramValue)) { + return ""; + } + return paramValue; + } + + @Override + public String toString() { + return "GoodsParamsDO [id=" + id + ", goodsId=" + goodsId + ", paramId=" + paramId + ", paramName=" + paramName + + ", paramValue=" + paramValue + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsSkuDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsSkuDO.java new file mode 100644 index 00000000..5440724d --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/GoodsSkuDO.java @@ -0,0 +1,225 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import cn.hutool.core.builder.EqualsBuilder; +import cn.hutool.core.builder.HashCodeBuilder; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.nutz.dao.entity.annotation.*; + +import javax.validation.constraints.Max; +import java.io.Serial; +import java.io.Serializable; + + +/** + * 商品sku实体 + * + * @author fky + * + */ +@Data +@Table("mall_goods_sku") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsSkuDO implements Serializable { + + @Serial + private static final long serialVersionUID = 5102510694003249L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long skuId; + /** + * 商品id + */ + @Column + @Comment("商品id") + @ColDefine(customType = "bigint") + private Long goodsId; + /** + * 商品名称 + */ + @Column + @Comment("商品名称") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String goodsName; + /** + * 商品编号 + */ + @Column + @Comment("商品编号") + @ColDefine(type = ColType.VARCHAR, width = 30) + @Length(max = 30,message = "商品规格编号太长，不能超过30个字符") + private String sn; + + /** + * 库存 + */ + @Column + @Comment("库存") + @ColDefine(type = ColType.INT) + @Max(value = 99999999, message = "库存不能超过99999999") + private Integer quantity; + /** + * 可用库存 + */ + @Column + @Comment("可用库存") + @ColDefine(type = ColType.INT) + private Integer enableQuantity; + /** + * 商品价格 + */ + @Column + @Comment("商品价格") + @ColDefine(type = ColType.DOUBLE) + @Max(value = 99999999, message = "价格不能超过99999999") + private Double price; + /** + * 规格信息json + */ + @Column + @Comment("规格信息json") + @ColDefine(type = ColType.MYSQL_JSON) + private String specs; + /** + * 成本价格 + */ + @Column + @Comment("成本价格") + @ColDefine(type = ColType.DOUBLE) + @Max(value = 99999999, message = "成本价格不能超过99999999") + private Double cost; + /** + * 重量 + */ + @Column + @Comment("重量") + @ColDefine(type = ColType.DOUBLE) + @Max(value = 99999999, message = "重量不能超过99999999") + private Double weight; + /** + * 卖家id + */ + @Column + @Comment("卖家id") + @ColDefine(customType = "bigint") + private Long sellerId; + /** + * 卖家名称 + */ + @Column + @Comment("卖家名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sellerName; + /** + * 分类id + */ + @Column + @Comment("分类id") + @ColDefine(customType = "bigint") + private Long categoryId; + /** + * 缩略图 + */ + @Column + @Comment("缩略图") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String thumbnail; + + @Column + @Comment("hash_code") + @ColDefine(type = ColType.INT) + private Integer hashCode; + + /** + * 运费模板ID（非数据库字段） + */ + private Long templateId; + + @JsonIgnore + protected String scanRounds; + + @Override + public String toString() { + return "GoodsSkuDO{" + + "skuId=" + skuId + + ", goodsId=" + goodsId + + ", goodsName='" + goodsName + '\'' + + ", sn='" + sn + '\'' + + ", quantity=" + quantity + + ", enableQuantity=" + enableQuantity + + ", price=" + price + + ", specs='" + specs + '\'' + + ", cost=" + cost + + ", weight=" + weight + + ", sellerId=" + sellerId + + ", sellerName='" + sellerName + '\'' + + ", categoryId=" + categoryId + + ", thumbnail='" + thumbnail + '\'' + + ", hashCode=" + hashCode + + ", templateId=" + templateId + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + GoodsSkuDO that = (GoodsSkuDO) o; + + return new EqualsBuilder() + .append(getSkuId(), that.getSkuId()) + .append(getGoodsId(), that.getGoodsId()) + .append(getGoodsName(), that.getGoodsName()) + .append(getSn(), that.getSn()) + .append(getQuantity(), that.getQuantity()) + .append(getEnableQuantity(), that.getEnableQuantity()) + .append(getPrice(), that.getPrice()) + .append(getSpecs(), that.getSpecs()) + .append(getCost(), that.getCost()) + .append(getWeight(), that.getWeight()) + .append(getSellerId(), that.getSellerId()) + .append(getSellerName(), that.getSellerName()) + .append(getCategoryId(), that.getCategoryId()) + .append(getThumbnail(), that.getThumbnail()) + .append(hashCode, that.hashCode) + .append(getTemplateId(), that.getTemplateId()) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append(getSkuId()) + .append(getGoodsId()) + .append(getGoodsName()) + .append(getSn()) + .append(getQuantity()) + .append(getEnableQuantity()) + .append(getPrice()) + .append(getSpecs()) + .append(getCost()) + .append(getWeight()) + .append(getSellerId()) + .append(getSellerName()) + .append(getCategoryId()) + .append(getThumbnail()) + .append(hashCode) + .append(getTemplateId()) + .toHashCode(); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/ParameterGroupDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/ParameterGroupDO.java new file mode 100644 index 00000000..b27ac8f1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/ParameterGroupDO.java @@ -0,0 +1,64 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.nutz.dao.entity.annotation.*; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + + +/** + * 参数组实体 + * + * @author fky + * + */ +@Data +@Table("mall_parameter_group") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class ParameterGroupDO implements Serializable { + + private static final long serialVersionUID = 2394621849767871L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long groupId; + /** + * 参数组名称 + */ + @Column + @Comment("参数组名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + @NotEmpty(message = "参数组名称不能为空") + @Length(max = 50, message = "参数组名称不能超过50字") + private String groupName; + /** + * 关联分类id + */ + @Column + @Comment("关联分类id") + @ColDefine(customType = "bigint") + private Long categoryId; + /** + * 排序 + */ + @Column + @Comment("id") + @ColDefine(type = ColType.INT) + private Integer sort; + + @Override + public String toString() { + return "ParameterGroupDO [groupId=" + groupId + ", groupName=" + groupName + ", categoryId=" + categoryId + + ", sort=" + sort + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/ParametersDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/ParametersDO.java new file mode 100644 index 00000000..5f99103b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/ParametersDO.java @@ -0,0 +1,113 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.nutz.dao.entity.annotation.*; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +/** + * 参数实体 + * + * @author fky + * + */ +@Data +@Table("mall_parameters") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class ParametersDO implements Serializable { + + private static final long serialVersionUID = 320610453789555L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long paramId; + /** + * 参数名称 + */ + @Column + @Comment("参数名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + @NotEmpty(message = "参数名称必填") + @Length(max = 50, message = "参数名称不能超过50字") + private String paramName; + /** + * 参数类型1 输入项 2 选择项 + */ + @Column + @Comment("参数类型1 输入项 2 选择项") + @ColDefine(type = ColType.INT) + @NotNull(message = "参数类型必选") + @Min(value = 1,message = "参数类型传值不正确") + @Max(value = 2,message = "参数类型传值不正确") + private Integer paramType; + /** + * 选择值，当参数类型是选择项2时，必填，逗号分隔 + */ + @Column + @Comment("选择值") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String options; + /** + * 是否可索引，0 不显示 1 显示 + */ + @Column + @Comment("是否可索引必选") + @ColDefine(type = ColType.INT) + @NotNull(message = "是否可索引必选") + @Min(value = 0,message = "是否可索引传值不正确") + @Max(value = 1,message = "是否可索引传值不正确") + private Integer isIndex; + /** + * 是否必填是 1 否 0 + */ + @Column + @Comment("是否必填") + @ColDefine(type = ColType.INT) + @NotNull(message = "是否必填必选") + @Min(value = 0,message = "是否必填传值不正确") + @Max(value = 1,message = "是否必填传值不正确") + private Integer required; + /** + * 参数分组id + */ + @Column + @Comment("参数分组id") + @ColDefine(customType = "bigint") + @NotNull(message = "所属参数组不能为空") + private Long groupId; + /** + * 分类id + */ + @Column + @Comment("分类id") + @ColDefine(customType = "bigint") + private Long categoryId; + /** + * 排序 + */ + @Column + @Comment("参数组名称") + @ColDefine(type = ColType.INT) + private Integer sort; + + @Override + public String toString() { + return "ParametersDO [paramId=" + paramId + ", paramName=" + paramName + ", paramType=" + paramType + + ", options=" + options + ", isIndex=" + isIndex + ", required=" + required + ", groupId=" + groupId + + ", categoryId=" + categoryId + ", sort=" + sort + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/QuantityLog.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/QuantityLog.java new file mode 100644 index 00000000..8c69d992 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/QuantityLog.java @@ -0,0 +1,153 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import cn.hutool.core.builder.EqualsBuilder; +import cn.hutool.core.builder.HashCodeBuilder; +import com.budwk.app.zhgh.mall.manage.models.goods.vo.GoodsQuantityVO; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import java.io.Serial; +import java.io.Serializable; + + +/** + * 库存日志表实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@Table("mall_quantity_log") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class QuantityLog implements Serializable { + + @Serial + private static final long serialVersionUID = 6427256120262393L; + + /** + * 日志id + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long logId; + /** + * 订单编号 + */ + @Column + @Comment("订单编号") + @ColDefine(type = ColType.VARCHAR, width = 100) + @NotEmpty(message = "订单编号不能为空") + private String orderSn; + /** + * 商品id + */ + @Column + @Comment("商品id") + @ColDefine(customType = "bigint") + @NotEmpty(message = "商品id不能为空") + private Long goodsId; + /** + * sku id + */ + @Column + @Comment("sku id") + @ColDefine(customType = "bigint") + private Long skuId; + /** + * 库存数 + */ + @Column + @Comment("库存数") + @ColDefine(type = ColType.INT) + @NotEmpty(message = "库存数不能为空") + private Integer quantity; + /** + * 可用库存 + */ + @Column + @Comment("可用库存") + @ColDefine(type = ColType.INT) + @Min(message = "必须为数字", value = 0) + private Integer enableQuantity; + /** + * 操作时间 + */ + @Column + @Comment("操作时间") + @ColDefine(customType = "bigint") + private Long opTime; + + @Column + @Comment("日志类型") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String logType; + + @Column + @Comment("原因") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String reason; + + public QuantityLog(GoodsQuantityVO goodsQuantity) { + this.skuId = goodsQuantity.getSkuId(); + this.quantity = goodsQuantity.getQuantity(); + + this.goodsId = goodsQuantity.getGoodsId(); + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + + QuantityLog that = (QuantityLog) o; + + return new EqualsBuilder() + .append(orderSn, that.orderSn) + .append(goodsId, that.goodsId) + .append(skuId, that.skuId) + .append(quantity, that.quantity) + .append(enableQuantity, that.enableQuantity) + .append(logType, that.logType) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append(orderSn) + .append(goodsId) + .append(skuId) + .append(quantity) + .append(enableQuantity) + .append(logType) + .toHashCode(); + } + + @Override + public String toString() { + return "QuantityLog{" + + "logId=" + logId + + ", orderSn='" + orderSn + '\'' + + ", goodsId=" + goodsId + + ", skuId=" + skuId + + ", quantity=" + quantity + + ", enableQuantity=" + enableQuantity + + ", opTime=" + opTime + + ", logType='" + logType + '\'' + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/SpecValuesDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/SpecValuesDO.java new file mode 100644 index 00000000..10f92e0f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/SpecValuesDO.java @@ -0,0 +1,78 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serializable; + + +/** + * 规格值实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_spec_values") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class SpecValuesDO implements Serializable { + + private static final long serialVersionUID = 5356147177823233L; + + /** + * 主键 + */ + @Id + @Column + @Comment("规格值id") + @ColDefine(customType = "bigint") + private Long specValueId; + /** + * 规格项id + */ + @Column + @Comment("规格项id") + @ColDefine(customType = "bigint") + private Long specId; + /** + * 规格值名字 + */ + @Column + @Comment("规格值名字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String specValue; + /** + * 所属卖家 + */ + @Column + @Comment("所属卖家") + @ColDefine(customType = "bigint") + private Long sellerId; + + /** + * 规格名称 + */ + @Column + @Comment("规格名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String specName; + + public SpecValuesDO(Long specId, String specValue, Long sellerId) { + super(); + this.specId = specId; + this.specValue = specValue; + this.sellerId = sellerId; + } + + @Override + public String toString() { + return "SpecValuesDO [specValueId=" + specValueId + ", specId=" + specId + ", specValue=" + specValue + + ", sellerId=" + sellerId + "]"; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/SpecificationDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/SpecificationDO.java new file mode 100644 index 00000000..c6ee3d27 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/SpecificationDO.java @@ -0,0 +1,83 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; +import org.nutz.dao.entity.annotation.*; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + + +/** + * 规格项实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_specification") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class SpecificationDO implements Serializable { + + private static final long serialVersionUID = 5111769180376075L; + + /** + * 主键 + */ + @Id + @Column + @Comment("id") + @ColDefine(customType = "bigint") + private Long specId; + /** + * 规格项名称 + */ + @Column + @Comment("规格项名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + @NotEmpty(message = "规格项名称不能为空") + private String specName; + /** + * 是否被删除0 删除 1 没有删除 + */ + @Column + @Comment("参数名称") + @ColDefine(type = ColType.INT) + private Integer disabled; + /** + * 规格描述 + */ + @Column + @Comment("规格描述") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Length(max = 50, message = "规格备注为0到50个字符之间") + private String specMemo; + /** + * 所属卖家 0属于平台 + */ + @Column + @Comment("所属卖家 0属于平台") + @ColDefine(customType = "bigint") + private Long sellerId; + + public SpecificationDO(String specName, Integer disabled, String specMemo, Long sellerId) { + super(); + this.specName = specName; + this.disabled = disabled; + this.specMemo = specMemo; + this.sellerId = sellerId; + } + + @Override + public String toString() { + return "SpecificationDO [specId=" + specId + ", specName=" + specName + ", disabled=" + disabled + ", specMemo=" + + specMemo + ", sellerId=" + sellerId + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/TagGoodsDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/TagGoodsDO.java new file mode 100644 index 00000000..723514c8 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/TagGoodsDO.java @@ -0,0 +1,64 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 标签商品关联实体 + * + * @author fky + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Table("mall_tag_goods") +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class TagGoodsDO implements Serializable { + + @Serial + private static final long serialVersionUID = 9467335201085494L; + + @Id + @Column + @Comment("规格值id") + @ColDefine(customType = "bigint") + private Long id; + + /** + * 标签id + */ + @Column + @Comment("标签id") + @ColDefine(customType = "bigint") + private Long tagId; + /** + * 商品id + */ + @Column + @Comment("商品id") + @ColDefine(customType = "bigint") + private Long goodsId; + + public TagGoodsDO(Long tagId, Long goodsId) { + super(); + this.tagId = tagId; + this.goodsId = goodsId; + } + + @Override + public String toString() { + return "TagGoodsDO{" + + "tagId=" + tagId + + ", goodsId=" + goodsId + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/TagsDO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/TagsDO.java new file mode 100644 index 00000000..a7a82042 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/entity/TagsDO.java @@ -0,0 +1,76 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.entity; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.nutz.dao.entity.annotation.*; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 商品标签实体 + * + * @author fky + * + */ +@Data +@Table("mall_tags") +@NoArgsConstructor +@AllArgsConstructor +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class TagsDO implements Serializable { + + @Serial + private static final long serialVersionUID = 1899720595535600L; + + /** + * 主键 + */ + @Id + @Column + @Comment("规格值id") + @ColDefine(customType = "bigint") + private Long tagId; + /** + * 标签名字 + */ + @Column + @Comment("标签名字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String tagName; + /** + * 所属卖家 + */ + @Column + @Comment("所属卖家") + @ColDefine(customType = "bigint") + private Long sellerId; + /** + * 关键字 + */ + @Column + @Comment("关键字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String mark; + + public TagsDO(String tagName, Long sellerId, String mark) { + super(); + this.tagName = tagName; + this.sellerId = sellerId; + this.mark = mark; + } + + @Override + public String toString() { + return "TagsDO{" + + "tagId=" + tagId + + ", tagName='" + tagName + '\'' + + ", sellerId=" + sellerId + + ", mark='" + mark + '\'' + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/GoodsOperate.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/GoodsOperate.java new file mode 100644 index 00000000..a2c44e32 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/GoodsOperate.java @@ -0,0 +1,25 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + +/** + * 商品操作枚举 + * @author fky + */ +public enum GoodsOperate { + /** + * 下架 + */ + UNDER, + /** + * 还原 + */ + REVRET, + /** + * 放入回收站 + */ + RECYCLE, + /** + * 删除 + */ + DELETE + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/GoodsType.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/GoodsType.java new file mode 100644 index 00000000..702e9695 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/GoodsType.java @@ -0,0 +1,23 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + +/** + * 商品类型枚举 + * @author fky + */ +public enum GoodsType { + /** + * 正常商品 + */ + NORMAL("正常商品"), + /** + * 积分商品 + */ + POINT("积分商品"); + + private String description; + + GoodsType(String description) { + this.description = description; + + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/Permission.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/Permission.java new file mode 100644 index 00000000..b686eae7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/Permission.java @@ -0,0 +1,30 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + + +/** + * 权限枚举 + * @author fky + */ +public enum Permission { + + /** + * 卖家权限 + */ + SELLER, + + /** + * 买家权限 + */ + BUYER, + + /** + * 管理员权限 + */ + ADMIN, + + /** + * 不验证权限 + */ + CLIENT + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/QuantityLogType.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/QuantityLogType.java new file mode 100644 index 00000000..1b70a59a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/QuantityLogType.java @@ -0,0 +1,33 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + +/** + * 库存日志类型 + * @author fky + */ +public enum QuantityLogType { + + /** + * 订单创建扣减库存 + */ + ORDER_CREATE, + + /** + * 订单取消 + */ + ORDER_CANCEL, + + /** + * 库存回滚 + */ + ROLLBACK, + + /** + * 发货 + */ + SHIP, + + /** + * 退货 + */ + RETURN +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/QuantityType.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/QuantityType.java new file mode 100644 index 00000000..b258d9c8 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/QuantityType.java @@ -0,0 +1,19 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + +/** + * 库存数类型 + * @author fky + */ +public enum QuantityType { + + /** + * 实际的库存，包含了待发货的 + */ + actual, + + /** + * 可以售的库存，不包含待发货的 + */ + enable + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/StockType.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/StockType.java new file mode 100644 index 00000000..171d9759 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/StockType.java @@ -0,0 +1,31 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + +/** + * 缓存中库存类型 + * 用于更新缓存等操作使用 + * @author fky + */ +public enum StockType { + + + /** + * sku实际的库存，包含了待发货的 + */ + SKU_STOCK_ACTUAL, + + /** + * sku可以售的库存，不包含待发货的 + */ + SKU_STOCK_ENABLE, + + /** + * goods实际的库存，包含了待发货的 + */ + GOODS_STOCK_ACTUAL, + + /** + * goods可以售的库存，不包含待发货的 + */ + GOODS_STOCK_ENABLE, + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/TagType.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/TagType.java new file mode 100644 index 00000000..7c08b02a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/enums/TagType.java @@ -0,0 +1,38 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.enums; + +/** + * 标签类型 + * @author fky + */ +public enum TagType { + + /** + * 热卖排行 + */ + HOT("hot","热卖排行"), + /** + * 新品推荐 + */ + NEW("new","新品推荐"), + /** + * 推荐商品 + */ + RECOMMEND("recommend","推荐商品"); + + private String mark; + private String tagName; + + TagType(String mark,String tagName) { + + this.mark = mark; + this.tagName = tagName; + } + + public String mark(){ + return this.mark; + } + + public String tagName(){ + return this.tagName; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/ExchangeVO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/ExchangeVO.java new file mode 100644 index 00000000..7e3626fa --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/ExchangeVO.java @@ -0,0 +1,48 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.vo; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 商品的积分兑换信息 + * @author fky + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class ExchangeVO implements Serializable{ + + @Serial + private static final long serialVersionUID = 4702156500500693965L; + + /** 是否允许兑换 */ + @ApiModelProperty("是否允许积分兑换") + private Integer enableExchange; + + /** 兑换所需金额 */ + @ApiModelProperty("兑换所需金额") + private Double exchangeMoney; + + /** 商品所属积分分类 */ + @ApiModelProperty("积分兑换所属分类") + private Long categoryId; + + /** 兑换所需积分 */ + @ApiModelProperty("积分兑换使用的积分") + private Integer exchangePoint; + + @Override + public String toString() { + return "ExchangeVO [enableExchange=" + enableExchange + ", exchangeMoney=" + exchangeMoney + ", categoryId=" + + categoryId + ", exchangePoint=" + exchangePoint + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsMobileIntroVO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsMobileIntroVO.java new file mode 100644 index 00000000..f5869460 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsMobileIntroVO.java @@ -0,0 +1,64 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.vo; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Objects; + +/** + * 商品移动端详情VO + * @author fky + */ +@Data +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsMobileIntroVO implements Serializable { + + @Serial + private static final long serialVersionUID = 7556885109369605084L; + + @ApiModelProperty("类型 text：文字，image：图片") + private String type; + + @ApiModelProperty("内容") + private String content; + + @ApiModelProperty("是否选中") + private Boolean checked; + + @ApiModelProperty("是否选中编辑") + private Boolean editChecked; + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + GoodsMobileIntroVO that = (GoodsMobileIntroVO) o; + return Objects.equals(type, that.type) && + Objects.equals(content, that.content) && + Objects.equals(checked, that.checked) && + Objects.equals(editChecked, that.editChecked); + } + + @Override + public int hashCode() { + return Objects.hash(type, content, checked, editChecked); + } + + @Override + public String toString() { + return "GoodsMobileIntroVO{" + + "type='" + type + '\'' + + ", content='" + content + '\'' + + ", checked=" + checked + + ", editChecked=" + editChecked + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsQuantityVO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsQuantityVO.java new file mode 100644 index 00000000..2fab8a39 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsQuantityVO.java @@ -0,0 +1,91 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.vo; + + +import cn.hutool.core.builder.EqualsBuilder; +import cn.hutool.core.builder.HashCodeBuilder; +import com.budwk.app.zhgh.mall.manage.models.goods.enums.QuantityType; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 商品库存vo + * @author fky + */ +@Data +@NoArgsConstructor +public class GoodsQuantityVO implements Cloneable{ + + private Long goodsId; + + private Long skuId; + + private Integer quantity; + + private QuantityType quantityType; + + + public GoodsQuantityVO(Long goodsId, Long skuId, Integer quantity ) { + super(); + this.goodsId = goodsId; + this.skuId = skuId; + this.quantity = quantity; + + } + + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } + + + public Integer getQuantity() { + if ( quantity==null){ + return 0; + } + + return quantity; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + + GoodsQuantityVO that = (GoodsQuantityVO) o; + + return new EqualsBuilder() + .append(goodsId, that.goodsId) + .append(skuId, that.skuId) + .append(quantity, that.quantity) + .append(quantityType, that.quantityType) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append(goodsId) + .append(skuId) + .append(quantity) + .append(quantityType) + .toHashCode(); + } + + @Override + public String toString() { + return "GoodsQuantityVO{" + + "goodsId=" + goodsId + + ", skuId=" + skuId + + ", quantity=" + quantity + + ", quantityType=" + quantityType + + '}'; + } + + +} + diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsSkuVO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsSkuVO.java new file mode 100644 index 00000000..e382c316 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/GoodsSkuVO.java @@ -0,0 +1,176 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.vo; + +import cn.hutool.json.JSONUtil; +import com.budwk.app.zhgh.mall.manage.models.goods.entity.DraftGoodsSkuDO; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.Max; +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * 商品sku + * @author fky + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class GoodsSkuVO implements Serializable { + + @Serial + private static final long serialVersionUID = -666090547834195127L; + + /** + * 主键 + */ + @ApiModelProperty("sku表主键") + private Long skuId; + /** + * 商品id + */ + @ApiModelProperty("商品id") + private Long goodsId; + /** + * 商品名称 + */ + @ApiModelProperty("商品名称") + private String goodsName; + /** + * 商品编号 + */ + @ApiModelProperty("商品编号") + @Length(max = 30,message = "商品规格编号太长，不能超过30个字符") + private String sn; + + /** + * 库存 + */ + @ApiModelProperty("库存") + @Max(value = 99999999, message = "库存不能超过99999999") + + private Integer quantity; + /** + * 可用库存 + */ + @ApiModelProperty("可用库存") + + private Integer enableQuantity; + /** + * 商品价格 + */ + @ApiModelProperty("商品价格") + @Max(value = 99999999, message = "价格不能超过99999999") + private Double price; + /** + * 规格信息json + */ + @ApiModelProperty("规格信息json") + private String specs; + /** + * 成本价格 + */ + @ApiModelProperty("成本价格") + @Max(value = 99999999, message = "成本价格不能超过99999999") + private Double cost; + /** + * 重量 + */ + @ApiModelProperty("重量") + @Max(value = 99999999, message = "重量不能超过99999999") + private Double weight; + /** + * 卖家id + */ + @ApiModelProperty("卖家id") + private Long sellerId; + /** + * 卖家名称 + */ + @ApiModelProperty("卖家名称") + private String sellerName; + /** + * 分类id + */ + @ApiModelProperty("分类id") + private Long categoryId; + /** + * 缩略图 + */ + @ApiModelProperty("缩略图") + private String thumbnail; + + + @ApiModelProperty("hash_code") + private Integer hashCode; + + /** + * 运费模板ID（非数据库字段） + */ + @ApiModelProperty("运费模板ID") + private Long templateId; + + @JsonIgnore + protected String scanRounds; + + @ApiModelProperty("规格列表") + private List specList; + + @ApiModelProperty("谁承担运费0：买家承担，1：卖家承担") + private Integer goodsTransfeeCharge; + + @ApiModelProperty("是否被删除 0 删除 1 未删除") + private Integer disabled; + + @ApiModelProperty("上架状态 0下架 1上架") + private Integer marketEnable; + + @ApiModelProperty("商品类型NORMAL普通POINT积分") + private String goodsType; + + @ApiModelProperty("最后修改时间") + private Long lastModify; + + @ApiModelProperty("运费脚本") + private List scripts; + + public List getSpecList() { + if (this.getSpecs() != null) { + return JSONUtil.toList(this.getSpecs(), SpecValueVO.class); + } + + return specList; + } + + public GoodsSkuVO(DraftGoodsSkuDO draftSku) { + this.setCost(draftSku.getCost()); + this.setPrice(draftSku.getPrice()); + this.setQuantity(draftSku.getQuantity()); + this.setSkuId(draftSku.getDraftSkuId()); + this.setSn(draftSku.getSn()); + this.setWeight(draftSku.getWeight()); + this.setSpecList(JSONUtil.toList(draftSku.getSpecs(), SpecValueVO.class)); + } + + + @Override + public String toString() { + return "GoodsSkuVO{" + + "specList=" + specList + + ", goodsTransfeeCharge=" + goodsTransfeeCharge + + ", disabled=" + disabled + + ", marketEnable=" + marketEnable + + ", goodsType='" + goodsType + '\'' + + ", lastModify=" + lastModify + + ", scripts=" + scripts + + '}'; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/SpecValueVO.java b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/SpecValueVO.java new file mode 100644 index 00000000..06a82907 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/mall/manage/models/goods/vo/SpecValueVO.java @@ -0,0 +1,95 @@ +package com.budwk.app.zhgh.mall.manage.models.goods.vo; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 规格值实体 + * @author fky + */ +@Data +@NoArgsConstructor +@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) +public class SpecValueVO implements Serializable { + + /** + * 序列号 + */ + private static final long serialVersionUID = 1426807099688672502L; + + /** + * 主键 + */ + @ApiModelProperty("规格值id") + private Long specValueId; + /** + * 规格项id + */ + @ApiModelProperty("规格项id") + private Long specId; + /** + * 规格值名字 + */ + @ApiModelProperty("规格值名字") + private String specValue; + /** + * 所属卖家 + */ + @ApiModelProperty("所属卖家") + private Long sellerId; + + /** + * 规格名称 + */ + @ApiModelProperty("规格名称") + private String specName; + + /** + * 商品sku——id + */ + @ApiModelProperty("sku_id") + private Long skuId; + /** + * 商品大图 + */ + @ApiModelProperty("商品大图") + private String big; + /** + * 商品小图 + */ + @ApiModelProperty("商品小图") + private String small; + /** + * 商品缩略图 + */ + @ApiModelProperty("商品缩略图") + private String thumbnail; + /** + * 商品极小图 + */ + @ApiModelProperty("商品极小图") + private String tiny; + + /** + * 规格类型，1图片 0 非图片 + */ + @ApiModelProperty("该规格是否有图片，1 有 0 没有") + private Integer specType; + /** + * 规格图片 + */ + @ApiModelProperty("规格的图片") + private String specImage; + + @Override + public String toString() { + return "SpecValueVO [skuId=" + skuId + ", big=" + big + ", small=" + small + ", thumbnail=" + thumbnail + + ", tiny=" + tiny + ", specType=" + specType + ", specImage=" + specImage + "]"; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java new file mode 100644 index 00000000..63bb6348 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java @@ -0,0 +1,170 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.engine.FlowEngine; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpApplyController + * @Date 2025/7/31 8:41 + * @注释 困难补助申请 + */ +@IocBean +@Ok("json") +@ApiOperation("困难补助申请") +@At("/platform/difficultHelp/apply") +public class DifficultHelpApplyController { + + @Inject + private Dao dao; + @Inject + private FlowEngine flowEngine; + @Inject + private DifficultHelpCommonService difficultHelpCommonService; + + @At("") + @SaCheckPermission("difficultHelp.apply") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/apply/index.html") + public void index() { + } + + @At + @SaCheckPermission("difficultHelp.apply") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/apply/form.html") + public void form() { + } + + + @At + @ApiOperation("困难补助申请,我的申请列表") + @SaCheckPermission("difficultHelp.apply") + public Result pageData(DifficultHelpPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.proxyUserName, + info.proxyLoginName, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.subsidyStandards, + info.applyTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, + (SELECT MAX(id) FROM wf_process_task WHERE processInstanceId = ins.id AND taskName = 'startTask') AS startTaskId + FROM + difficult_help_info info + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageParam.buildSearch(cnd, "info."); + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { + cnd.desc("info.applyTime"); + } else { + cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("获取受助人") + @SaCheckPermission("difficultHelp.apply") + public Result queryRecipients(String key){ + Sql sql = Sqls.create(""" + SELECT + id, + loginname, + username, + birthday, + mobile, + sex, + unitName, + unionName, + unionId, + unitId + FROM + `vw_user` + $condition + """); + Cnd cnd = Cnd.NEW(); + + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { + cnd.and("unionid", "=", SecurityUtil.getUnionId()); + } else { + cnd.and("id", "=", SecurityUtil.getUserId()); + } + } + + if (Strings.isNotBlank(key)) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("username", key); + group.orLike("loginname", key); + cnd.and(group); + } + sql.setCondition(cnd); + Pagination pagination = difficultHelpCommonService.listPageMap(1, 10, sql); + return Result.success().addData(pagination.getList()); + } + + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("困难帮扶删除申请") + @SLog(tag = "困难帮扶申请", msg = "删除困难帮扶申请") + public Result onDelete(@Valid String id){ + dao.clear(DifficultHelpInfo.class, Cnd.where("id", "=", id)); + // 流程相关操作 + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java new file mode 100644 index 00000000..198d850b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpBranchUnionApprovalController.java @@ -0,0 +1,119 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam; +import io.swagger.annotations.ApiOperation; +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.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpBranchUnionApprovalController + * @Date 2025/7/31 11:47 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("困难补助分工会审核") +@At("/platform/difficultHelp/branchUnionApproval") +public class DifficultHelpBranchUnionApprovalController { + + @Inject + private Dao dao; + @Inject + private DifficultHelpCommonService difficultHelpCommonService; + + @At("") + @SaCheckPermission("difficultHelp.branchUnionApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html") + public void index() { + } + + @At + @SaCheckPermission("difficultHelp.branchUnionApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html") + public void form() { + } + + + @At + @ApiOperation("困难补助分工会审核列表") + @SaCheckPermission("difficultHelp.branchUnionApproval") + public Result pageData(DifficultHelpPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.proxyUserName, + info.proxyLoginName, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.subsidyStandards, + info.applyTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN difficult_help_info info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 + $condition + """); + Cnd cnd = Cnd.NEW(); + pageParam.buildSearch(cnd, "info."); + + cnd.and("t.taskName", "=", "9d11798e-a0e4-4ff5-939b-e6c5519e0eb6"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (pageParam.getAudit()) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { + cnd.desc("t.createdAt"); + cnd.desc("info.applyTime"); + } else { + cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); + } + cnd.groupBy("t.id"); + sql.setCondition(cnd); + + Pagination pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); + return Result.success().addData(pagination); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java new file mode 100644 index 00000000..9bc0865c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java @@ -0,0 +1,86 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam; +import io.swagger.annotations.ApiOperation; +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.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpReadingController + * @Date 2025/7/31 15:07 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("困难补助汇总阅览") +@At("/platform/difficultHelp/reading") +public class DifficultHelpReadingController { + + @Inject + private Dao dao; + @Inject + private DifficultHelpCommonService difficultHelpCommonService; + + @At("") + @SaCheckPermission("difficultHelp.reading") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/reading/index.html") + public void index() { + } + + + @At + @ApiOperation("困难补助汇总阅览列表") + @SaCheckPermission("difficultHelp.reading") + public Result pageData(DifficultHelpPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.proxyUserName, + info.proxyLoginName, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.subsidyStandards, + info.applyTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable + FROM + difficult_help_info info + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageParam.buildSearch(cnd, "info."); + Pagination pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); + return Result.success().addData(pagination); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java new file mode 100644 index 00000000..0908b1b1 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpSchoolUnionApprovalController.java @@ -0,0 +1,119 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.vo.DifficultHelpPageParam; +import io.swagger.annotations.ApiOperation; +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.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpSchoolUnionApprovalController + * @Date 2025/7/31 11:47 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("困难补助校工会审核") +@At("/platform/difficultHelp/schoolUnionApproval") +public class DifficultHelpSchoolUnionApprovalController { + + @Inject + private Dao dao; + @Inject + private DifficultHelpCommonService difficultHelpCommonService; + + @At("") + @SaCheckPermission("difficultHelp.schoolUnionApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html") + public void index() { + } + + @At + @SaCheckPermission("difficultHelp.schoolUnionApproval") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html") + public void form() { + } + + + @At + @ApiOperation("困难补助校工会审核列表") + @SaCheckPermission("difficultHelp.schoolUnionApproval") + public Result pageData(DifficultHelpPageParam pageParam) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.proxyUserName, + info.proxyLoginName, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.subsidyStandards, + info.applyTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariable, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN difficult_help_info info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 + $condition + """); + Cnd cnd = Cnd.NEW(); + pageParam.buildSearch(cnd, "info."); + + cnd.and("t.taskName", "=", "715ece82-4ae3-433c-ad18-ed875f45d1e3"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (pageParam.getAudit()) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { + cnd.desc("t.createdAt"); + cnd.desc("info.applyTime"); + } else { + cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); + } + cnd.groupBy("t.id"); + sql.setCondition(cnd); + + Pagination pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); + return Result.success().addData(pagination); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpViewController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpViewController.java new file mode 100644 index 00000000..31036922 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpViewController.java @@ -0,0 +1,47 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpViewController + * @Date 2025/7/31 11:50 + * @注释 + */ +@IocBean +@Ok("json") +@ApiOperation("困难补助查看") +@At("/platform/difficultHelp/view") +public class DifficultHelpViewController { + + @Inject + private Dao dao; + @Inject + private DifficultHelpCommonService difficultHelpCommonService; + + @At("") + @SaCheckPermission("difficultHelp.apply") + @Ok("beetl:/platform/zhgh/staffbenefit/difficulthelp/view/index.html") + public void index() { + } + + + @At + @ApiModelProperty("获取困难补助申请") + @SaCheckPermission("difficultHelp.apply") + public Result findOne(String id) { + DifficultHelpInfo helpInfo = dao.fetch(DifficultHelpInfo.class, id); + return Result.success().addData(helpInfo); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/interceptor/DifficultHelpSaveInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/interceptor/DifficultHelpSaveInterceptor.java new file mode 100644 index 00000000..8ae79f5c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/interceptor/DifficultHelpSaveInterceptor.java @@ -0,0 +1,40 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.interceptor; + +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.json.Json; + +import java.util.Date; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpSaveInterceptor + * @Date 2025/7/31 11:04 + * @注释 + */ +public class DifficultHelpSaveInterceptor implements FlowInterceptor { + + @Override + public void intercept(Execution execution) { + System.out.println("difficult help apply .................."); + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + + Dao dao = ServiceContext.find(Dao.class); + DifficultHelpInfo article = Json.fromJson(DifficultHelpInfo.class, formDataStr); + article.setApplyTime(new Date()); + dao.insertOrUpdate(article); + + execution.getArgs().set(FlowConst.FORM_DATA, Json.toJson(article)); + + int instanceId = execution.getArgs().getInt(FlowConst.PROCESS_INSTANCE_ID_KEY); + dao.update(ProcessInstance.class, Chain.make("businessNo", article.getId()), Cnd.where(ProcessInstance::getId, "=", instanceId)); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/models/DifficultHelpInfo.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/models/DifficultHelpInfo.java new file mode 100644 index 00000000..e89635f8 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/models/DifficultHelpInfo.java @@ -0,0 +1,160 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.models; + +import cn.hutool.json.JSONObject; +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficulHelpInfo + * @Date 2025/7/30 17:33 + * @注释 + */ +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class DifficultHelpInfo extends BaseModel { + + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("申请时间") + @ColDefine(type = ColType.DATETIME) + private Date applyTime; + + @Column + @Comment("申请模式") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String mode; + + @Column + @Comment("填写人id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String proxyUserId; + + @Column + @Comment("填写人姓名") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String proxyUserName; + + @Column + @Comment("填写人工号") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String proxyLoginName; + + @Column + @Comment("申请人id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("申请人姓名") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String userName; + + @Column + @Comment("申请人工号") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String loginName; + + @Column + @Comment("性别") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String sex; + + @Column + @Comment("单位") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unitId; + + @Column + @Comment("单位名称") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String unitName; + + @Column + @Comment("分工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("工会名称") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String unionName; + + @Column + @Comment("月收入") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String monthlyIncome; + + @Column + @Comment("出生日期") + @ColDefine(type = ColType.DATE) + private Date birthday; + + @Column + @Comment("联系电话") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String mobile; + + @Column + @Comment("身份证号码") + @ColDefine(type = ColType.VARCHAR, width = 30) + private String idCard; + + @Column + @Comment("职务职称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String officialCapacity; + + @Column + @Comment("银行卡号（华夏银行工资卡卡号）") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String bankCardNum; + + @Column + @Comment("家庭住址") + @ColDefine(type = ColType.VARCHAR, width = 200) + private String homeAddress; + + @Column + @Comment("补助标准") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String subsidyStandards; + + @Column + @Comment("家庭成员") + @ColDefine(type = ColType.MYSQL_JSON) + private List familyList; + + @Column + @Comment("申请理由") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String reason; + + @Column + @Comment("备注") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String remarks; + + @Column + @Comment("附件") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; + + @Column + @Comment("申请人签字") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String sign; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java new file mode 100644 index 00000000..34b6e296 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/DifficultHelpCommonService.java @@ -0,0 +1,14 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpCommonService + * @Date 2025/7/31 9:16 + * @注释 + */ +public interface DifficultHelpCommonService extends BaseService { +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java new file mode 100644 index 00000000..d6d1696c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/service/impl/DifficultHelpCommonServiceImpl.java @@ -0,0 +1,22 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.service.impl; + +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.service.DifficultHelpCommonService; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.IocBean; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpCommonServiceImpl + * @Date 2025/7/31 9:16 + * @注释 + */ +@IocBean(args = {"refer:dao"}) +public class DifficultHelpCommonServiceImpl extends BaseServiceImpl implements DifficultHelpCommonService { + + public DifficultHelpCommonServiceImpl(Dao dao) { + super(dao); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java new file mode 100644 index 00000000..0955a5f4 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/vo/DifficultHelpPageParam.java @@ -0,0 +1,59 @@ +package com.budwk.app.zhgh.staffbenefit.difficulthelp.vo; + +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffbenefit.difficulthelp.models.DifficultHelpInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.Cnd; +import org.nutz.lang.Lang; + +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：DifficultHelpPageParam + * @Date 2025/7/31 9:50 + * @注释 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DifficultHelpPageParam extends PageForm { + + private String year; + + private String unionId; + + private String unitId; + + private List dateRange; + + public void buildSearch(Cnd cnd, String prefix){ + if (cnd == null) { + cnd = Cnd.NEW(); + } + + cnd.andEX("YEAR(" + prefix + "applyTime)", "=", this.getYear()); + + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { + cnd.and(prefix + "unionid", "=", SecurityUtil.getUnionId()); + } else { + cnd.and(prefix + "userId", "=", SecurityUtil.getUserId()); + } + } else { + cnd.andEX(prefix + "unionId", "=", this.getUnionId()); + } + + cnd.andEX(prefix + "unitId", "=", this.getUnitId()); + + if (Lang.isNotEmpty(this.getDateRange())) { + cnd.andEX("DATE(" + prefix + "applyTime)", ">=", this.getDateRange().get(0)); + cnd.andEX("DATE(" + prefix + "applyTime)", "<=", this.getDateRange().get(1)); + } + + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeOrigin.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeOrigin.java index dea5c619..eba2f917 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeOrigin.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeOrigin.java @@ -16,14 +16,15 @@ import lombok.Getter; @AllArgsConstructor public enum MemberChangeOrigin { - PERSONAL("个人"), + PERSONAL("个人申请变更"), BRANCH_UNION("分工会变更"), BRANCH_UNION_VERIFICATION("分工会名单事项核对"), UNION_GROUP("工会小组变更"), SCHOOL_UNION("校工会变更"), SCHOOL_UNION_VERIFICATION("校工会名单事项核对"), SYSTEM("系统数据更新"), - OTHER("其他"); + HAND_MOVEMENT("手动数据更新"), + OTHER("其他方式变更"); /** * 避免和枚举类的name冲突 diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeType.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeType.java index f905537f..60d47d98 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeType.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/constant/MemberChangeType.java @@ -1,5 +1,6 @@ package com.budwk.app.zhgh.staffmanage.member.constant; +import com.budwk.app.base.annotation.DictEnum; import lombok.AllArgsConstructor; import lombok.Getter; @@ -12,13 +13,22 @@ import lombok.Getter; */ @Getter @AllArgsConstructor +@DictEnum(key = "MemberChangeType", name = "会员变更类型") public enum MemberChangeType { //变更类型 NEW("新入职"), RESTORE("入会"), WITHDRAWAL("退会"), + WORK("在职"), + LEAVE_SCHOOL("离校"), + RETIRE("退休"), + RESIGN("辞职"), + OUT("调出"), + LEAVE_OFFICE("离职"), + OTHER("其他减员"), UNIT_CHANGE("单位异动"), + UNION_CHANGE("工会关系异动"), BASIC_CHANGE("基本信息异动"); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java new file mode 100644 index 00000000..7210d56f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java @@ -0,0 +1,156 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.apply; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; +import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; +import com.budwk.app.bpm.param.BpmTaskApprovalParam; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.web.commons.base.Globals; +import com.budwk.app.web.controllers.open.commons.service.CommonService; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import com.budwk.app.zhgh.staffmanage.member.vo.MemberCommonVo; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.Static; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 会员入会申请分工会审核 + * @author fky + */ +@IocBean +@Ok("json:full") +@ApiOperation("会员入会申请分工会审核") +@At("/platform/member/apply/branchUnionApproval") +public class MemberApplyBranchUnionApprovalController { + + @Inject + private BpmService bpmService; + @Inject + private CommonService commonService; + @Inject + private MemberCommonService memberCommonService; + @Inject + private MemberApplyRecordService memberApplyRecordService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html") + @SaCheckPermission("member.apply.branchUnionApproval") + public void index() { + } + + @At + @Ok("beetl:/platform/zhgh/staffmanage/member/apply/branchunionapproval/form.html") + @SaCheckPermission("member.apply.branchUnionApproval") + public void form() { + } + + @At + @ApiOperation("会员入会申请分工会审核列表") + @SaCheckPermission("member.apply.branchUnionApproval") + public Result pageData(MemberApplyPageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.userState, + info.preparedBy, + info.personType, + info.sign, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN member_apply_record info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 + $condition + """); + Cnd cnd = Cnd.NEW(); + MemberApplyPageForm.buildSearch(cnd, pageForm); + + if ("HMC".equals(Globals.SchoolCode)) { + cnd.and("t.taskName", "=", "8337f4ee-d8ff-45e2-8e21-978d916f64da"); + } else { + cnd.and("t.taskName", "=", "9d94ac55-ef3d-4c28-9f77-1a8de099f1ad"); + } + + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (pageForm.getAudit()) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("t.createdAt"); + cnd.desc("info.applyDateTime"); + } else { + cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + + @At + @ApiOperation("分工会审核撤回") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.apply.branchUnionApproval") + @SLog(tag = "会员管理-入会申请-分工会撤回", msg = "分工会入会审核撤回") + public Result revoke(@Valid String taskId) { + bpmService.revokeTask(taskId); + return Result.success(); + } +} + + + + + diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java deleted file mode 100644 index 59fb9dfa..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.apply; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; -import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; -import com.budwk.app.bpm.param.BpmTaskApprovalParam; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.web.controllers.open.commons.service.CommonService; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyBranchAuditPageForm; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import com.budwk.app.zhgh.staffmanage.member.vo.MemberApplyVo; -import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.Static; -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.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 会员入会申请分工会审核 - */ -@IocBean -@At("/platform/member/apply/branchUnionAudit") -@Ok("json:full") -public class MemberApplyBranchUnionAuditController { - - @Inject - private MemberApplyRecordService memberApplyRecordService; - @Inject - private MemberManageService memberManageService; - @Inject - private BpmService bpmService; - @Inject - private CommonService commonService; - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/apply/branchunionaudit/index.html") - @SaCheckPermission("member.apply.branchUnionAudit") - public void index() { - } - - @At - @SaCheckPermission("member.apply.branchUnionAudit") - public Result pageData(MemberApplyPageForm pageForm) { - Sql sql = Sqls.create(""" - SELECT - record.id, - vu.id AS userId, - vu.username, - vu.loginname, - record.changeType, - record.changeTypes, - record.changeOrigin, - record.applyDateTime, - record.unitId, - IFNULL(record.unionId, vu.unionid) AS unionId, - vu.unionname AS unionName, - IFNULL(record.unitName, vu.unitname) AS unitName, - IFNULL(record.userState, vu.userState) AS userState, - IFNULL(record.preparedBy, vu.preparedBy) AS preparedBy, - IFNULL(record.personType, vu.personType) AS personType, - inst.id processInstanceId, - inst.processInstanceNodeId, - inst.processInstanceNodeName, - inst.processInstanceTaskIds, - inst.processInstanceStatus, - task.id processInstanceTaskId, - task.taskStatus processInstanceTaskStatus, - COUNT(nt.id) OVER (PARTITION BY task.id) > 0 AS nextTaskIsComplete - FROM - bpm_process_task task - INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId - INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId - INNER JOIN bpm_process_define define On inst.processDefineId = define.id - INNER JOIN member_apply_record record ON record.id = inst.processInstanceBusinessId - LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE' - LEFT JOIN vw_user vu ON vu.id = record.userId - $condition - """); - Cnd cnd = Cnd.NEW(); - MemberApplyPageForm.buildSearch(cnd, pageForm); - if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){ - cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname()))); - } - cnd.and("nd.nodeCode","=",20); - if (pageForm.getAudit() != null) { - if (pageForm.getAudit()) { - cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE); - } else { - cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE); - } - } - cnd.and("define.`code`", "=", BpmProcessConstant.MEMBER_SINGLE_APPLY.name()); - cnd.desc("task.createdOn"); - cnd.groupBy("record.id"); - sql.setCondition(cnd); - Pagination listPageVO = memberApplyRecordService.listPageVO(pageForm, sql, MemberApplyVo.class); - return Result.success(listPageVO); - } - - - @At - @Aop(TransAop.READ_COMMITTED) - @ApiOperation("会员入会分工会审核") - @SaCheckPermission("member.apply.branchUnionAudit") - @SLog(tag = "会员管理-会员入会申请-分工会审核", msg = "会员入会审核（分工会）") - public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) { - approvalParam.getBpmTaskApprovalTypeEnum(); - Map variables = BeanUtil.beanToMap(approvalParam); - - List assignments = new ArrayList<>(); - if(approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)){ - String approvalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.SCHOOL_UNION_ADMIN); - assignments.add(approvalLoginName); - } - bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, assignments); - return Result.success(); - } - - - @At - @ApiOperation("分工会审核撤回") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.apply.branchUnionAudit") - @SLog(tag = "会员管理-入会申请-分工会撤回", msg = "分工会入会审核撤回") - public Result revoke(@Valid String taskId) { - bpmService.revokeTask(taskId); - return Result.success(); - } - - - /** - * 获取变更信息，审核 - * @param recordId - * @return - */ - @At - @SaCheckPermission(value = {"member.apply.branchUnionAudit","member.apply.mine","member.apply.schoolUnionAudit"}, mode = SaMode.OR) - public Result findAuditChangeInfo(@Valid String recordId) { - Sys_user_history history = memberApplyRecordService.dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", recordId).or("id","=",recordId)); - MemberApplyRecord record = memberApplyRecordService.dao().fetch(MemberApplyRecord.class, recordId); - if (ObjectUtil.isAllEmpty(history, record)) { - return Result.error("获取变更信息失败"); - } - List nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_SINGLE_APPLY, recordId); - if (Lang.isNotEmpty(history)) { - List nutMaps = memberManageService.compareMemberChangeInfo(history); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } - List nutMaps = memberManageService.compareMemberChangeInfo(record); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } -} - - - - - diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java index 670d6a82..6f964df7 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyController.java @@ -2,22 +2,21 @@ package com.budwk.app.zhgh.staffmanage.member.controller.apply; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.bpm.enums.BpmProcessInstanceStatusEnum; +import com.budwk.app.bpm.models.BpmProcessInstance; +import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.web.controllers.open.commons.service.CommonService; -import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; -import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; @@ -28,27 +27,26 @@ import org.nutz.dao.util.cri.Static; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import javax.validation.Valid; -import java.util.List; -import java.util.stream.Stream; /** * 会员申请 */ @IocBean -@At("/platform/member/apply/submit") @Ok("json:full") +@At("/platform/member/apply/submit") public class MemberApplyController { @Inject private Dao dao; @Inject - private BpmService bpmservice; + private FlowEngine flowEngine; @Inject - private CommonService commonService; + private MemberCommonService memberCommonService; @At("") @Ok("beetl:/platform/zhgh/staffmanage/member/apply/submit/index.html") @@ -56,8 +54,77 @@ public class MemberApplyController { public void index() { } + @At + @Ok("beetl:/platform/zhgh/staffmanage/member/apply/submit/form.html") + @SaCheckPermission("member.apply.submit") + public void form() { + } @At + @ApiOperation("会员入会申请,我的申请列表") + @SaCheckPermission("member.apply.submit") + public Result pageData(MemberApplyPageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.userState, + info.preparedBy, + info.personType, + info.sign, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke, + (select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId + FROM + member_apply_record info + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + MemberApplyPageForm.buildSearch(cnd, pageForm); + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.applyDateTime"); + } else { + cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("删除入会申请") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.apply.submit") + @SLog(tag = "会员入会申请", msg = "删除入会申请id: ${args[0]}") + public Result onDelete(@Valid String id) { + dao.clear(MemberApplyRecord.class, Cnd.where("id", "=", id)); + // 流程相关操作 + flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id); + return Result.success(); + } + + + @At + @ApiOperation("根据申请或修改，查询不同数据") @SaCheckPermission(value = {"member.apply.submit","member.branchUnion.record","member.schoolUnion.record"}, mode = SaMode.OR) public Result findOne(@Valid String id, @Valid Boolean isEdit) { if (isEdit) { @@ -69,53 +136,20 @@ public class MemberApplyController { } - @At - @Aop(TransAop.READ_COMMITTED) - @ApiOperation("保存入会申请") - @SaCheckPermission("member.apply.submit") - @SLog(tag = "会员管理-入会申请-保存申请", msg = "保存申请") - public Result doSave(MemberApplyRecord record){ - record.setMember(true); - record.setUserId(SecurityUtil.getUserId()); - record.setChangeOrigin(MemberChangeOrigin.PERSONAL.name()); - record.setChangeType(MemberChangeType.RESTORE.name()); - record.setChangeTypes(List.of(MemberChangeType.RESTORE.name())); - dao.insertOrUpdate(record); - bpmservice.startSaveProcessInstance(BpmProcessConstant.MEMBER_SINGLE_APPLY.name(), - "【会员入会申请】" + record.getUsername(), record.getId(), null); - return Result.success(); - } - - /** - * 提交申请 + * 查询申请记录 + * @param id + * @return */ @At - @Aop(TransAop.READ_COMMITTED) - @ApiOperation("提交入会申请") + @ApiOperation("根据id查询申请记录") @SaCheckPermission("member.apply.submit") - @SLog(tag = "会员管理-入会申请-提交申请", msg = "提交申请") - public Object doSubmit(MemberApplyRecord record) { - record.setMember(true); - record.setUserId(SecurityUtil.getUserId()); - record.setChangeType(MemberChangeType.RESTORE.name()); - record.setChangeTypes(List.of(MemberChangeType.RESTORE.name())); - dao.insertOrUpdate(record); - //设置分工会审核人 - List users = commonService.findUserInfoByRoleCode("unionId", SecurityUtil.getUnionId(), RoleConstant.BRANCH_UNION_CHAIRMAN.name()); - if (ObjectUtil.isEmpty(users)) { - return Result.error("您的分工会没有设置审核人，请联系校工会！"); - } - List operatorUsers = commonService.findUserInfoByRoleCode("unionId", SecurityUtil.getUnionId(), RoleConstant.BRANCH_UNION_OPERATOR.name()); - - List assignments = Stream.concat(users.stream(), operatorUsers.stream()).distinct().toList(); - - bpmservice.startSubmitProcessInstance(BpmProcessConstant.MEMBER_SINGLE_APPLY.name(), - "【会员入会申请】" + record.getUsername(), record.getId(), assignments.stream().map(Sys_user::getLoginname).toList(), null); - return Result.success(); + public Result findApplyById(String id) { + return Result.success(dao.fetch(MemberApplyRecord.class,id)); } + @At @SaCheckPermission("member.apply.submit") public Result getApplyUserByUnionOperate(@Valid String keyWord){ @@ -135,20 +169,32 @@ public class MemberApplyController { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { sql.setVar("unionSql", new Static(" and u.unionId = %s".formatted(SecurityUtil.getUnionId()))); } - Pagination pagination = commonService.listPageMap(1, 20, sql); + Pagination pagination = memberCommonService.listPageMap(1, 20, sql); return Result.success(pagination.getList()); } - + /** + * 校验当前申请人是否有未走完的流程，只有等流程走完才能再次申请 + * @return + */ @At @SaCheckPermission("member.apply.submit") - public Result findApplyById(String id) { - return Result.success(dao.fetch(MemberApplyRecord.class,id)); + @ApiOperation("校验当前申请人是否有未走完的流程") + public Result validateApply(){ + int count = dao.count(BpmProcessInstance.class, Cnd.where("processInstanceInitiatorId", "=", SecurityUtil.getUserId()) + .and("processInstanceStatus", "=", BpmProcessInstanceStatusEnum.RUNNING.name())); + return Result.success().addData(count); } + + /** + * 获取当前登录用户信息，是用来判断当前用户是否是会员 + * @return + */ @At + @ApiOperation("获取当前登录用户信息") @SaCheckPermission("member.apply.submit") - public Result findUserInfo() { + public Result getSelfUserInfo() { return Result.success(dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId()))); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java deleted file mode 100644 index 2744fcc9..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyMineController.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.apply; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; -import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import com.budwk.app.zhgh.staffmanage.member.vo.MemberApplyVo; -import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -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.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; - -/** - * 我的申请 - */ -@IocBean -@At("/platform/member/apply/mine") -@Ok("json:full") -public class MemberApplyMineController { - - @Inject - private MemberApplyRecordService memberApplyRecordService; - @Inject - private BpmService bpmService; - @Inject - private MemberManageService memberManageService; - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/apply/mine/index.html") - @SaCheckPermission("member.apply.mine") - public void index() { - } - - - @At - @SaCheckPermission("member.apply.mine") - public Result pageData(MemberApplyPageForm pageForm) { - Sql sql = Sqls.create(""" - SELECT - record.id, - vu.id AS userId, - vu.username, - vu.loginname, - record.changeType, - record.changeTypes, - record.changeOrigin, - record.applyDateTime, - record.unitId, - IFNULL(record.unionId, vu.unionid) AS unionId, - vu.unionname AS unionName, - IFNULL(record.unitName, vu.unitname) AS unitName, - IFNULL(record.userState, vu.userState) AS userState, - IFNULL(record.preparedBy, vu.preparedBy) AS preparedBy, - IFNULL(record.personType, vu.personType) AS personType, - inst.id processInstanceId, - inst.processInstanceNodeId, - inst.processInstanceNodeCode, - inst.processInstanceNodeName, - inst.processInstanceTaskIds, - inst.processInstanceStatus, - task.id processInstanceTaskId, - task.taskStatus processInstanceTaskStatus, - ( - SELECT - count( 1 ) > 0 - FROM - bpm_process_task - WHERE - prevTaskId = ( SELECT id FROM bpm_process_task WHERE processInstanceId = inst.id AND processTaskNodeCode IN ( 10, 40, 70 ) ORDER BY createdAt DESC LIMIT 1 ) - AND taskStatus = 'COMPELTE' - ) AS nextTaskIsComplete - FROM - bpm_process_task task - INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId - INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId - INNER JOIN bpm_process_define define On inst.processDefineId = define.id - INNER JOIN member_apply_record record ON record.id = inst.processInstanceBusinessId - LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE' - LEFT JOIN vw_user vu ON vu.id = record.userId - $condition - """); - Cnd cnd = Cnd.NEW(); - MemberApplyPageForm.buildSearch(cnd, pageForm); - cnd.and("nd.nodeCode", "=", 10); - cnd.and("define.`code`", "=", BpmProcessConstant.MEMBER_SINGLE_APPLY.name()); - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - if (AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { - cnd.andEX("vu.unionId","=", SecurityUtil.getUnionId()); - } else { - cnd.and("vu.id", "=", SecurityUtil.getUserId()); - } - } - cnd.desc("record.applyDateTime"); - sql.setCondition(cnd); - Pagination listPageVO = memberApplyRecordService.listPageVO(pageForm, sql, MemberApplyVo.class); - return Result.success(listPageVO); - } - - @At - @ApiOperation("删除会员申请记录") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.apply.mine") - @SLog(tag = "会员管理-入会申请-我的申请记录", msg = "删除申请") - public Result delete(@Valid String id) { - memberApplyRecordService.delete(id); - bpmService.deleteInstance(id); - return Result.success(); - } - - - @At - @ApiOperation("个人申请撤回") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.apply.mine") - @SLog(tag = "会员管理-入会申请-个人申请撤回", msg = "个人申请撤回") - public Result revokeApply(@Valid String id) { - bpmService.revokeApply(id); - return Result.success(); - } - - - /** - * 获取变更信息，审核 - * @param recordId - * @return - */ - @At - @SaCheckPermission("member.apply.mine") - public Result findAuditChangeInfo(@Valid String recordId) { - MemberApplyRecord record = new MemberApplyRecord(); - Cnd cnd = Cnd.NEW(); - cnd.and(Cnd.exps("recordId", "=", recordId).or("id","=",recordId)); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and("loginname", "=", SecurityUtil.getUserLoginname()); - record = memberApplyRecordService.dao().fetch(MemberApplyRecord.class, Cnd.where("loginname", "=", SecurityUtil.getUserLoginname()) - .and("id", "=", recordId)); - } else { - record = memberApplyRecordService.dao().fetch(MemberApplyRecord.class, recordId); - } - Sys_user_history history = memberApplyRecordService.dao().fetch(Sys_user_history.class, cnd); - - if (ObjectUtil.isAllEmpty(history, record)) { - return Result.error("您暂无权限查询"); - } - List nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_SINGLE_APPLY, recordId); - if (Lang.isNotEmpty(history)) { - List nutMaps = memberManageService.compareMemberChangeInfo(history); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } - List nutMaps = memberManageService.compareMemberChangeInfo(record); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java new file mode 100644 index 00000000..48445e77 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java @@ -0,0 +1,174 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.apply; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; +import com.budwk.app.bpm.param.BpmTaskApprovalParam; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.web.commons.base.Globals; +import com.budwk.app.web.controllers.open.commons.service.CommonService; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import com.budwk.app.zhgh.staffmanage.member.vo.MemberCommonVo; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +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; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * 会员入会申请校工会审核 + * @author fky + */ +@IocBean +@Ok("json:full") +@At("/platform/member/apply/schoolUnionApproval") +public class MemberApplySchoolUnionApprovalController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private CommonService commonService; + @Inject + private MemberCommonService memberCommonService; + @Inject + private MemberApplyRecordService memberApplyRecordService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html") + @SaCheckPermission("member.apply.schoolUnionApproval") + public void index() { + } + + @At + @Ok("beetl:/platform/zhgh/staffmanage/member/apply/schoolunionapproval/form.html") + @SaCheckPermission("member.apply.schoolUnionApproval") + public void form() { + } + + + @At + @ApiOperation("会员入会校工会审核列表") + @SaCheckPermission("member.apply.schoolUnionApproval") + public Result pageData(MemberApplyPageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.userState, + info.preparedBy, + info.personType, + info.sign, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariable, + IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, + IF(rt.id IS NOT NULL, 1, 0) AS canRevoke + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN member_apply_record info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 + LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 + $condition + """); + Cnd cnd = Cnd.NEW(); + MemberApplyPageForm.buildSearch(cnd, pageForm); + if ("HMC".equals(Globals.SchoolCode)) { + cnd.and("t.taskName", "=", "5cdf34fe-4ba8-4e79-9832-ac5565a90d1a"); + } else { + cnd.and("t.taskName", "=", "00b620c5-5c64-48bd-9394-3621c1d91af8"); + } + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (pageForm.getAudit()) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("t.createdAt"); + cnd.desc("info.applyDateTime"); + } else { + cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @ApiOperation("会员入会校工会审核") + @SaCheckPermission("member.apply.schoolUnionApproval") + @SLog(tag = "会员管理-会员入会申请-校工会审核", msg = "会员入会审核（校工会）") + public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) { + Map variables = BeanUtil.beanToMap(approvalParam); + + if (approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)) { + // 审核通过了，要去改基础数据 + MemberApplyRecord record = memberCommonService.dao().fetch(MemberApplyRecord.class, Cnd.where("id", "=", approvalParam.getProcessInstanceBusinessId())); + Sys_user sysUser = new Sys_user(); + BeanUtil.copyProperties(record, sysUser); + sysUser.setId(record.getUserId()); + dao.updateIgnoreNull(sysUser); + } + bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, null); + return Result.success(); + } + + + @At + @ApiOperation("校工会审核撤回") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.apply.schoolUnionApproval") + @SLog(tag = "会员管理-入会申请-校工会撤回", msg = "校工会入会审核撤回") + public Result revoke(@Valid String taskId) { + bpmService.revokeTask(taskId); + return Result.success(); + } +} + + + + + diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java deleted file mode 100644 index 0b32cdfc..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionAuditController.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.apply; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.enums.BpmProcessTaskStatusEnum; -import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; -import com.budwk.app.bpm.param.BpmTaskApprovalParam; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.web.commons.auth.utils.AuthUtil; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.web.controllers.open.commons.service.CommonService; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import com.budwk.app.zhgh.staffmanage.member.vo.MemberApplyVo; -import io.swagger.annotations.ApiOperation; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.Static; -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.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.validation.Valid; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 会员入会申请校工会审核 - */ -@IocBean -@At("/platform/member/apply/schoolUnionAudit") -@Ok("json:full") -public class MemberApplySchoolUnionAuditController { - - @Inject - private MemberApplyRecordService memberApplyRecordService; - @Inject - private CommonService commonService; - @Inject - private BpmService bpmService; - @Inject - private MemberManageService memberManageService; - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/apply/schoolunionaudit/index.html") - @SaCheckPermission("member.apply.schoolUnionAudit") - public void index() { - } - - @At - @SaCheckPermission("member.apply.schoolUnionAudit") - public Result pageData(MemberApplyPageForm pageForm) { - Sql sql = Sqls.create(""" - SELECT - record.id, - vu.id AS userId, - vu.username, - vu.loginname, - record.changeType, - record.changeTypes, - record.changeOrigin, - record.applyDateTime, - record.unitId, - IFNULL(record.unionId, vu.unionid) AS unionId, - vu.unionname AS unionName, - IFNULL(record.unitName, vu.unitname) AS unitName, - IFNULL(record.userState, vu.userState) AS userState, - IFNULL(record.preparedBy, vu.preparedBy) AS preparedBy, - IFNULL(record.personType, vu.personType) AS personType, - inst.id processInstanceId, - inst.processInstanceNodeId, - inst.processInstanceNodeName, - inst.processInstanceTaskIds, - inst.processInstanceStatus, - task.id processInstanceTaskId, - task.taskStatus processInstanceTaskStatus, - COUNT(nt.id) OVER (PARTITION BY task.id) > 0 AS nextTaskIsComplete - FROM - bpm_process_task task - INNER JOIN bpm_process_node_define nd ON nd.id = task.processTaskNodeId - INNER JOIN bpm_process_instance inst ON inst.id = task.processInstanceId - INNER JOIN bpm_process_define define On inst.processDefineId = define.id - INNER JOIN member_apply_record record ON record.id = inst.processInstanceBusinessId - LEFT JOIN bpm_process_task nt ON nt.prevTaskId = task.id AND nt.taskStatus = 'COMPLETE' - LEFT JOIN vw_user vu ON vu.id = record.userId - $condition - """); - Cnd cnd = Cnd.NEW(); - MemberApplyPageForm.buildSearch(cnd, pageForm); - if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){ - cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname()))); - } - cnd.and("nd.nodeCode","=",50); - if (pageForm.getAudit() != null) { - if (pageForm.getAudit()) { - cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.COMPLETE); - } else { - cnd.and("task.taskStatus", "=", BpmProcessTaskStatusEnum.ACTIVE); - } - } - cnd.and("define.`code`", "=", BpmProcessConstant.MEMBER_SINGLE_APPLY.name()); - cnd.desc("task.createdOn"); -// cnd.groupBy("record.id"); - sql.setCondition(cnd); - Pagination listPageVO = memberApplyRecordService.listPageVO(pageForm, sql, MemberApplyVo.class); - return Result.success(listPageVO); - } - - - @At - @Aop(TransAop.READ_COMMITTED) - @ApiOperation("会员入会校工会审核") - @SaCheckPermission("member.apply.branchUnionAudit") - @SLog(tag = "会员管理-会员入会申请-校工会审核", msg = "会员入会审核（校工会）") - public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) { - Map variables = BeanUtil.beanToMap(approvalParam); - if (approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)) { - MemberApplyRecord record = memberManageService.dao().fetch(MemberApplyRecord.class, Cnd.where("id", "=", approvalParam.getProcessInstanceBusinessId())); - memberManageService.compareMemberChangeInfoAndUpdateUser(record); - } - bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, null); - return Result.success(); - } - - - @At - @ApiOperation("校工会审核撤回") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.apply.branchUnionAudit") - @SLog(tag = "会员管理-入会申请-校工会撤回", msg = "校工会入会审核撤回") - public Result revoke(@Valid String taskId) { - bpmService.revokeTask(taskId); - return Result.success(); - } - - - /** - * 获取变更信息，审核 - * @param recordId - * @return - */ - @At - @SaCheckPermission(value = "member.apply.branchUnionAudit") - public Result findAuditChangeInfo(@Valid String recordId){ - Sys_user_history history = memberApplyRecordService.dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", recordId).or("id","=",recordId)); - MemberApplyRecord record = memberApplyRecordService.dao().fetch(MemberApplyRecord.class, recordId); - if (ObjectUtil.isAllEmpty(history, record)) { - return Result.error("获取变更信息失败"); - } - List nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_SINGLE_APPLY, recordId); - if (Lang.isNotEmpty(history)) { - List nutMaps = memberManageService.compareMemberChangeInfo(history); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } - List nutMaps = memberManageService.compareMemberChangeInfo(record); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } -} - - - - - diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyViewController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyViewController.java new file mode 100644 index 00000000..a3dcff87 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyViewController.java @@ -0,0 +1,72 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.apply; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberApplyPageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberApplyRecordService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import com.budwk.app.zhgh.staffmanage.member.vo.MemberCommonVo; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +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; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; +import java.util.List; + +/** + * 我的申请 + * @author fky + */ +@IocBean +@Ok("json:full") +@ApiOperation("会员入会申请，查看") +@At("/platform/member/apply/view") +public class MemberApplyViewController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private MemberCommonService memberCommonService; + @Inject + private MemberApplyRecordService memberApplyRecordService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/apply/view/index.html") + @SaCheckPermission("member.apply.submit") + public void index() { + } + + /** + * 获取申请信息 + * @param id + * @return + */ + @At + @ApiOperation("获取申请信息") + @SaCheckPermission(value = {"member.apply.submit", "member.apply.branchUnionApproval", "member.apply.branchUnionApproval"}, mode = SaMode.OR) + public Result findMemberApplyRecord(@Valid String id) { + MemberApplyRecord record = dao.fetch(MemberApplyRecord.class, id); + return Result.success().addData(record); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionAuditController.java deleted file mode 100644 index b84b219b..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionAuditController.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.branch; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.ObjectUtil; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.param.BpmTaskApprovalParam; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberBranchUnionManageService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -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.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.validation.Valid; -import java.util.List; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberBranchUnionAuditController - * @Date 2024/8/13 8:48 - * @注释 分工会管理，分工会审核 - */ -@Slf4j -@IocBean -@Ok("json") -@At("/platform/member/branchUnion/audit") -public class MemberBranchUnionAuditController { - - @Inject - private MemberBranchUnionManageService memberBranchUnionManageService; - @Inject - private MemberManageService memberManageService; - @Inject - private BpmService bpmService; - - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/branch/audit/index.html") - @SaCheckPermission("member.branchUnion.audit") - public void index() { - } - - - @At - @SaCheckPermission("member.branchUnion.audit") - public Result pageData(MemberManagePageForm pageForm) { - Pagination pageData = memberBranchUnionManageService.getPageData(pageForm); - return Result.success(pageData); - } - - - @At - @ApiOperation("分工会审核") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.branchUnion.audit") - @SLog(tag = "会员管理-分工会管理", type = "memberBranchUnionManage", msg = "分工会审核") - public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) { - bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), null, null); - return Result.success(); - } - - - @At - @ApiOperation("分工会审核撤回") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.branchUnion.audit") - @SLog(tag = "会员管理-分工会管理", type = "memberBranchUnionManage", msg = "分工会审核撤回") - public Result revoke(@Valid String taskId) { - bpmService.revokeTask(taskId); - return Result.success(); - } - - - /** - * 获取变更信息，审核 - * @param recordId - * @return - */ - @At - @SaCheckPermission(value = {"member.branchUnion.audit", "member.schoolUnion.audit"}, mode = SaMode.OR) - public Result findAuditChangeInfo(String recordId) { - Sys_user_history history = memberBranchUnionManageService.dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", recordId).or("id","=",recordId)); - MemberApplyRecord record = memberBranchUnionManageService.dao().fetch(MemberApplyRecord.class, recordId); - if (ObjectUtil.isAllEmpty(history, record)) { - return Result.error("获取变更信息失败"); - } - List nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_BRANCH_UNION_CHANGE, recordId); - if (Lang.isNotEmpty(history)) { - List nutMaps = memberManageService.compareMemberChangeInfo(history); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } - List nutMaps = memberManageService.compareMemberChangeInfo(record); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionManageController.java deleted file mode 100644 index f0557db2..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionManageController.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.branch; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.annotation.RepeatSubmit; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.constant.RoleConstant; -import com.budwk.app.base.exception.BaseException; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.sys.models.Sys_user; -import com.budwk.app.web.controllers.open.commons.service.CommonService; -import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import lombok.extern.slf4j.Slf4j; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Cnd; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.aop.Aop; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.validation.Valid; -import java.util.List; -import java.util.Objects; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberBranchUnionManageListController - * @Date 2024/8/12 14:06 - * @注释 会员分工会管理 - */ -@IocBean -@At("/platform/member/branchUnion/manage/list") -@Slf4j -@Ok("json") -public class MemberBranchUnionManageController { - - @Inject - private MemberManageService memberManageService; - @Inject - private CommonService commonService; - @Inject - private BpmService bpmservice; - - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/branch/manage/index.html") - @SaCheckPermission("member.branchUnion.manage.list") - public void index() { - } - - - @At - @SaCheckPermission("member.branchUnion.manage.list") - @Ok("json:{dateFormat:'yyyy-MM-dd'}") - public Result pageData(MemberManagePageForm pageForm) { - Sql sql = memberManageService.getSql(pageForm, "branchUnion"); - Pagination pagination = memberManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); - } - - - @At - @SaCheckPermission("member.branchUnion.manage.list") - @SLog(tag = "添加会员", type = "memberBranchManage", msg = "添加会员") - public Result addMember(@Valid MemberApplyRecord record) { - return null; - } - - - @At - @SaCheckPermission("member.branchUnion.manage.list") - public Result getChangeInfoByUserId(String userId) { - return Result.success(memberManageService.getMemberChangeInfoByUserId(userId)); - } - - - @At - @SaCheckPermission("member.branchUnion.manage.list") - @Aop(TransAop.READ_COMMITTED) - @RepeatSubmit - @SLog(tag = "分工会管理-会员管理", type = "MemberBranchManageList", msg = "分工会普通变更") - public Result generalMemberChange(@Param("record") MemberApplyRecord record) { - try { - if (Objects.isNull(record)) { - return Result.error("数据获取失败"); - } - Sys_user user = memberManageService.dao().fetch(Sys_user.class, Cnd.where("loginname", "=", record.getLoginname())); - record.setUserId(user.getId()); - if ( record.getEdit() == null || !record.getEdit()) { - // 校验是否有变更的字段 - List changeInfoList = memberManageService.compareMemberChangeInfo(record); - // 存储变更的类型 - List changeTypeList = memberManageService.compareMemberChangeType(changeInfoList, record); - // 有字段发生变更会走下面的方法，没有则会抛异常 - record.setChangeTypes(changeTypeList); - record.setChangeOrigin(MemberChangeOrigin.BRANCH_UNION.name()); - memberManageService.dao().insert(record); - } else { - record.setChangeOrigin(MemberChangeOrigin.BRANCH_UNION.name()); - memberManageService.dao().updateIgnoreNull(record); - } - - String approvalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.SCHOOL_UNION_MEMBER_ADMIN); - if (StrUtil.isBlank(approvalLoginName)) { - throw new BaseException("校工会会员管理员未设置"); - } - bpmservice.startSubmitProcessInstance(BpmProcessConstant.MEMBER_BRANCH_UNION_CHANGE.name(), "【会员分工会变更】" +record.getUsername(), record.getId(), List.of(approvalLoginName), null); - return Result.success(); - } catch (Exception e) { - return Result.error(e.getMessage()); - } - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionRecordController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionRecordController.java deleted file mode 100644 index 456216cf..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/MemberBranchUnionRecordController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.branch; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import lombok.extern.slf4j.Slf4j; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -import javax.validation.Valid; -import java.util.List; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberBranchRecordController - * @Date 2024/8/13 16:25 - * @注释 分工会 会员变更记录 - */ -@Slf4j -@IocBean -@Ok("json") -@At("/platform/member/branchUnion/record") -public class MemberBranchUnionRecordController { - - @Inject - private MemberManageService memberManageService; - - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/branch/record/index.html") - @SaCheckPermission("member.branchUnion.record") - public void index() { - } - - - @At - @SaCheckPermission("member.branchUnion.record") - public Result pageData(MemberManagePageForm pageForm){ - Pagination pagination = memberManageService.memberHistoryRecords(pageForm); - return Result.success(pagination); - } - - - @At - @SaCheckPermission("member.branchUnion.record") - public Result findAuditChangeInfo(@Valid String recordId) { - Sys_user_history history = memberManageService.dao().fetch(Sys_user_history.class, recordId); - List list = memberManageService.compareMemberChangeInfo(history); - return Result.success(list); - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java new file mode 100644 index 00000000..09ec5c84 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberBranchUnionAuditController.java @@ -0,0 +1,160 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.change; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; +import com.budwk.app.bpm.models.BpmProcessInstance; +import com.budwk.app.bpm.models.BpmProcessTask; +import com.budwk.app.bpm.param.BpmTaskApprovalParam; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.sys.models.Sys_user_history; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.web.controllers.open.commons.service.CommonService; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberChangePageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberBranchUnionManageService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +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; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberBranchUnionAuditController + * @Date 2024/8/13 8:48 + * @注释 分工会管理，分工会审核 + */ +@Slf4j +@IocBean +@Ok("json") +@At("/platform/member/change/branchUnion/audit") +public class MemberBranchUnionAuditController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private CommonService commonService; + @Inject + private MemberCommonService memberCommonService; + @Inject + private MemberBranchUnionManageService memberBranchUnionManageService; + + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/change/branchUnionAudit/index.html") + @SaCheckPermission("member.change.branchUnion.audit") + public void index() { + } + + @At + @Ok("beetl:/platform/zhgh/staffmanage/member/change/branchUnionAudit/form.html") + @SaCheckPermission("member.change.branchUnion.audit") + public void form() { + } + + + @At + @ApiModelProperty("会员变更申请,分工会审核列表") + @SaCheckPermission("member.change.branchUnion.audit") + public Result pageData(MemberChangePageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.sex, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.userState, + info.preparedBy, + info.personType, + info.changeTypes, + info.applyDateTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariale + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN member_change_record info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageForm.buildSearch(cnd, "info."); + + cnd.and("t.taskName", "=", "8ca3bcf0-7b86-4ef2-b19f-b76a1707e2da"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (pageForm.getAudit()) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.applyDateTime"); + } else { + cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + + @At + @ApiOperation("分工会审核撤回") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.change.branchUnion.audit") + @SLog(tag = "会员管理-分工会管理", type = "memberBranchUnionManage", msg = "分工会审核撤回") + public Result revoke(@Valid String taskId) { + bpmService.revokeTask(taskId); + return Result.success(); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java new file mode 100644 index 00000000..f1b00071 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeApplyController.java @@ -0,0 +1,150 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.change; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.sys.models.Sys_unit; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.web.controllers.open.commons.service.CommonService; +import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberChangePageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.List; +import java.util.stream.Stream; + +@Slf4j +@IocBean +@Ok("json:full") +@ApiModel("会员变更申请") +@At("/platform/member/change/apply") +public class MemberChangeApplyController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private CommonService commonService; + @Inject + private MemberCommonService memberCommonService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/change/submit/index.html") + @SaCheckPermission("member.change.apply") + public void index() { + } + + @At + @Ok("beetl:/platform/zhgh/staffmanage/member/change/submit/form.html") + @SaCheckPermission("member.change.apply") + public void form() { + } + + @At + @ApiOperation("会员变更申请,我的申请列表") + @SaCheckPermission("member.change.apply") + public Result pageData(MemberChangePageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.username, + info.loginname, + info.sex, + info.unitName, + info.unionName, + info.userState, + info.preparedBy, + info.personType, + info.changeTypes, + info.applyDateTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariale + FROM + member_change_record info + LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id + AND t.taskState = 10 + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageForm.buildSearch(cnd, "info."); + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.applyDateTime"); + } else { + cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + + @At + @ApiModelProperty("根据id查询变更记录") + @SaCheckPermission("member.change.apply") + public Result findChangeById(String id){ + return Result.success().addData(dao.fetch(MemberChangeRecord.class, id)); + } + + /** + * 不知道有什么用，移过来的 + * @param userId + * @return + */ + @At + @SaCheckPermission(value = {"member.change.branchUnion.audit","member.change.schoolUnion.audit"}, mode = SaMode.OR) + public Result getUserByIdForMemberChange(String userId){ + View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", userId)); + NutMap nutMap = Lang.obj2nutmap(user); + if (StrUtil.isNotBlank(user.getUnionId())) { + Sys_union union = dao.fetch(Sys_union.class, Cnd.where("id", "=", user.getUnionId())); + nutMap.put("union", union); + } + if (StrUtil.isNotBlank(user.getUnitId())) { + Sys_unit unit = dao.fetch(Sys_unit.class, Cnd.where("id", "=", user.getUnitId())); + nutMap.put("unit", unit); + } + return Result.success().addData(nutMap); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java index 8c868892..d8785c62 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeManageController.java @@ -1,61 +1,145 @@ -//package com.budwk.app.zhgh.member.controller.change; -// -//import cn.dev33.satoken.annotation.SaCheckPermission; -//import com.budwk.app.base.annotation.SLog; -//import com.budwk.app.base.page.Pagination; -//import com.budwk.app.base.result.Result; -//import com.budwk.app.zhgh.member.models.MemberApplyRecord; -//import com.budwk.app.zhgh.member.param.MemberManagePageForm; -//import com.budwk.app.zhgh.member.service.MemberManageService; -//import lombok.extern.slf4j.Slf4j; -//import org.nutz.dao.sql.Sql; -//import org.nutz.ioc.loader.annotation.Inject; -//import org.nutz.ioc.loader.annotation.IocBean; -//import org.nutz.lang.util.NutMap; -//import org.nutz.mvc.annotation.At; -//import org.nutz.mvc.annotation.Ok; -// -//import javax.validation.Valid; -// -///** -// * @version 1.0 -// * @Author zzr -// * @name：MemberChangeManageController -// * @Date 2024/8/6 8:39 -// * @注释 -// */ -//@IocBean -//@Ok("json") -//@At("/platform/member/change/manage") -//@Slf4j -//public class MemberChangeManageController { -// -// @Inject -// private MemberManageService memberService; -// -// @At("") -// @Ok("beetl:/platform/zhgh/staffmanage/member/change/manage/index.html") -// @SaCheckPermission("member.branch.manage") -// public void index() { -// } -// -// -// @At -// @SaCheckPermission("member.branch.manage") -// public Result pageData(MemberManagePageForm pageForm) { -// Sql sql = memberService.getSql(pageForm,null); -// Pagination pagination = memberService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); -// return Result.success(pagination); -// } -// -// -// @At -// @SaCheckPermission("member.branch.manage") -// public Result getNumData(MemberManagePageForm pageForm) { -// NutMap map = memberService.getButtonNum(pageForm); -// return Result.success(map); -// } -// -// -// -//} +package com.budwk.app.zhgh.staffmanage.member.controller.change; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.budwk.app.base.annotation.RepeatSubmit; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; +import com.budwk.app.bpm.models.BpmProcessInstance; +import com.budwk.app.bpm.models.BpmProcessTask; +import com.budwk.app.bpm.param.BpmTaskApprovalParam; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.web.controllers.open.commons.service.CommonService; +import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.sql.Sql; +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.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberChangeManageController + * @Date 2024/8/12 14:06 + * @注释 会员变更高级管理 + */ +@Slf4j +@IocBean +@Ok("json") +@At("/platform/member/change/manage") +public class MemberChangeManageController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private CommonService commonService; + @Inject + private MemberCommonService memberCommonService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/change/manage/index.html") + @SaCheckPermission(value = {"member.change.mange", "staff.member.change.mange"}, mode = SaMode.OR) + public void index() { + } + + + @At + @SaCheckPermission(value = {"member.change.mange", "staff.member.change.mange"}, mode = SaMode.OR) + public Result pageData(MemberManagePageForm pageForm){ + Sql sql = memberCommonService.getSql(pageForm, "schoolUnion"); + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pagination); + } + + + @At + @RepeatSubmit + @Aop(TransAop.READ_COMMITTED) + @SLog(tag = "会员高级管理-会员变更", msg = "分工会/校工会会员管理员提交变更") + @SaCheckPermission(value = {"member.change.mange", "staff.member.change.mange"}, mode = SaMode.OR) + public Result doSubmitChange(@Param("record") MemberChangeRecord record, @Param("approvalRemark") String approvalRemark){ + // 检验是否有变更 + if (Lang.isEmpty(record)) { + return Result.error("未获取到异动数据"); + } + List changeInfos = memberCommonService.getChangeInfos(record); + if (Lang.isEmpty(changeInfos)) { + return Result.error("未校验到变更数据，请确认数据是否存在变更"); + } + + if (Lang.isEmpty(record.getChangeTypes())) { + record.setChangeTypes(List.of(MemberChangeType.BASIC_CHANGE.name())); + } else { + List changeTypes = record.getChangeTypes(); + changeTypes.add(MemberChangeType.BASIC_CHANGE.name()); + record.setChangeTypes(changeTypes); + } + + record.setApplyDateTime(DateUtil.date()); + record.setChangeOrigin("党委会变更"); + dao.insertOrUpdate(record); + + bpmService.startSubmitProcessInstance(BpmProcessConstant.MEMBER_CHANGE.name(), + "【会员变更】" + record.getUsername(), record.getId(), List.of(SecurityUtil.getUserLoginname()), null); + + // 有这个菜单权限的，那就是默认分工会审核通过了 + BpmProcessInstance instance = dao.fetch(BpmProcessInstance.class, Cnd.where("processInstanceBusinessId", "=", record.getId())); + BpmProcessTask task = dao.fetch(BpmProcessTask.class, Cnd.where(BpmProcessTask::getProcessInstanceId, "=", instance.getId()) + .desc(BpmProcessTask::getCreatedAt)); + BpmTaskApprovalParam param = new BpmTaskApprovalParam(); + param.setProcessInstanceId(instance.getId()); + param.setProcessInstanceBusinessId(record.getId()); + param.setProcessInstanceTaskId(task.getId()); + param.setBpmTaskApprovalType(BpmTaskApprovalTypeEnum.PASS.name()); + param.setBpmTaskApprovalTypeEnum(BpmTaskApprovalTypeEnum.PASS); + param.setApprovalOpinion("分工会审核通过"); + // 表示分工会审核通过 + param.getBpmTaskApprovalTypeEnum(); + Map variables = BeanUtil.beanToMap(param); + bpmService.completeTask(param.getProcessInstanceTaskId(), param.getBpmTaskApprovalTypeEnum(), variables, List.of(SecurityUtil.getUserLoginname())); + + // 如果有校工会或者超管的角色，直接审核通过了 + if (AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_CHAIRMAN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name(), RoleConstant.SYSADMIN.name())) { + BpmProcessInstance committeeInstance = dao.fetch(BpmProcessInstance.class, Cnd.where("processInstanceBusinessId", "=", record.getId())); + BpmProcessTask committeeTask = dao.fetch(BpmProcessTask.class, Cnd.where(BpmProcessTask::getProcessInstanceId, "=", committeeInstance.getId()) + .desc(BpmProcessTask::getCreatedAt)); + + BpmTaskApprovalParam committeeParam = new BpmTaskApprovalParam(); + committeeParam.setProcessInstanceId(committeeInstance.getId()); + committeeParam.setProcessInstanceBusinessId(record.getId()); + committeeParam.setProcessInstanceTaskId(committeeTask.getId()); + committeeParam.setBpmTaskApprovalType(BpmTaskApprovalTypeEnum.PASS.name()); + committeeParam.setBpmTaskApprovalTypeEnum(BpmTaskApprovalTypeEnum.PASS); + committeeParam.setApprovalOpinion("校工会审核通过"); + + memberCommonService.compareChangeInfoAndUpdateMember(committeeParam.getProcessInstanceBusinessId()); + bpmService.completeTask(committeeParam.getProcessInstanceTaskId(), committeeParam.getBpmTaskApprovalTypeEnum(), null, null); + } + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeRecordController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeRecordController.java index 23b7cb2c..c1854416 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeRecordController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeRecordController.java @@ -4,28 +4,32 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; import lombok.extern.slf4j.Slf4j; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import javax.validation.Valid; +import java.util.List; + /** * @version 1.0 * @Author zzr - * @name：MemberChangeRecordsController - * @Date 2024/8/8 8:40 - * @注释 + * @name：MemberSchoolRecordController + * @Date 2024/8/13 16:27 + * @注释 校工会 会员变更记录 */ +@Slf4j @IocBean @Ok("json") @At("/platform/member/change/record") -@Slf4j public class MemberChangeRecordController { @Inject - private MemberManageService memberService; + private MemberCommonService memberCommonService; @At("") @Ok("beetl:/platform/zhgh/staffmanage/member/change/record/index.html") @@ -35,8 +39,16 @@ public class MemberChangeRecordController { @At @SaCheckPermission("member.change.record") - public Result pageData(MemberManagePageForm pageForm) { - Pagination pagination = memberService.memberHistoryRecords(pageForm); + public Result pageData(MemberManagePageForm pageForm){ + Pagination pagination = memberCommonService.memberHistoryRecords(pageForm); return Result.success(pagination); } + + + @At + @SaCheckPermission("member.change.record") + public Result findAuditChangeInfo(@Valid String recordId) { + List list = memberCommonService.getChangeInfos(recordId); + return Result.success(list); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeViewController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeViewController.java new file mode 100644 index 00000000..2ce50fce --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberChangeViewController.java @@ -0,0 +1,89 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.change; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.result.Result; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; +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; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberChangeMineController + * @Date 2025/2/14 11:13 + * @注释 + */ + +@IocBean +@Ok("json:full") +@ApiModel("会员变更申请查看") +@At("/platform/member/change/view") +public class MemberChangeViewController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private MemberCommonService memberCommonService; + + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/change/view/index.html") + @SaCheckPermission("member.change.apply") + public void index() { + } + + + @At + @ApiOperation("个人申请撤回") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.change.apply") + @SLog(tag = "会员变更申请", msg = "撤回申请") + public Result doRevoke(@Valid String id){ + bpmService.revokeApply(id); + return Result.success(); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.change.apply") + @SLog(tag = "会员入会申请", msg = "删除申请") + public Result doDelete(String id){ + dao.clear(MemberChangeRecord.class, Cnd.where("id", "=", id)); + bpmService.deleteInstance(id); + return Result.success(); + } + + + @At + @ApiOperation("根据id查询变更记录") + @SaCheckPermission("member.change.apply") + public Result findMemberChangeRecord(String id){ + MemberChangeRecord record = dao.fetch(MemberChangeRecord.class, id); + NutMap nutMap = Lang.obj2nutmap(record); + + List changeInfos = memberCommonService.getChangeInfos(nutMap.getString("id")); + nutMap.put("changeInfos", changeInfos); + return Result.success().addData(nutMap); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java new file mode 100644 index 00000000..079b2328 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/change/MemberSchoolUnionAuditController.java @@ -0,0 +1,222 @@ +package com.budwk.app.zhgh.staffmanage.member.controller.change; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.RepeatSubmit; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.PageUtil; +import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; +import com.budwk.app.bpm.models.BpmProcessInstance; +import com.budwk.app.bpm.models.BpmProcessTask; +import com.budwk.app.bpm.param.BpmTaskApprovalParam; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; +import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.sys.models.Sys_user_history; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberChangePageForm; +import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberSchoolUnionManageService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +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; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberSchoolUnionAuditController + * @Date 2024/8/13 8:49 + * @注释 + */ +@Slf4j +@IocBean +@Ok("json") +@At("/platform/member/change/schoolUnion/audit") +public class MemberSchoolUnionAuditController { + + @Inject + private Dao dao; + @Inject + private BpmService bpmService; + @Inject + private MemberCommonService memberCommonService; + @Inject + private MemberSchoolUnionManageService memberSchoolUnionManageService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/member/change/schoolUnionAudit/index.html") + @SaCheckPermission("member.change.schoolUnion.audit") + public void index() { + } + + @At + @Ok("beetl:/platform/zhgh/staffmanage/member/change/schoolUnionAudit/form.html") + @SaCheckPermission("member.change.schoolUnion.audit") + public void form() { + } + + + @At + @SaCheckPermission("member.change.schoolUnion.audit") + public Result pageData(MemberChangePageForm pageForm) { + Sql sql = Sqls.create(""" + SELECT + info.id, + info.sex, + info.userName, + info.loginName, + info.unitName, + info.unionName, + info.userState, + info.preparedBy, + info.personType, + info.changeTypes, + info.applyDateTime, + ins.id AS instanceId, + ins.businessNo, + ins.state instanceState, + ins.variable instanceVariale, + t.id taskId, + t.taskName AS taskKey, + t.displayName taskName, + t.taskType, + t.performType taskPerformType, + t.taskState, + t.finishTime, + t.taskParentId, + t.variable taskVariale + FROM + wf_process_task t + LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId + LEFT JOIN member_change_record info ON info.id = ins.businessNo + LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id + $condition + """); + Cnd cnd = Cnd.NEW(); + pageForm.buildSearch(cnd, "info."); + + cnd.and("t.taskName", "=", "f18d8726-75bc-43a9-87a8-2dd73341bdce"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + + if (pageForm.getAudit()) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } + + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.applyDateTime"); + } else { + cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + sql.setCondition(cnd); + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @RepeatSubmit + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.change.schoolUnion.audit") + @SLog(tag = "会员管理-校工会管理", type = "memberSchoolUnionAudit", msg = "校工会会员审核") + public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) { + Map variables = BeanUtil.beanToMap(approvalParam); + if (approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)) { + MemberChangeRecord record = memberCommonService.dao().fetch(MemberChangeRecord.class, Cnd.where("id", "=", approvalParam.getProcessInstanceBusinessId())); + if (StrUtil.isNotEmpty(approvalParam.getApprovalRemark())) { + memberCommonService.dao().update(MemberChangeRecord.class, Chain.make("remark", approvalParam.getApprovalRemark()), Cnd.where("id", "=", record.getId())); + } + memberCommonService.compareChangeInfoAndUpdateMember(record); + } + bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, null); + return Result.success(); + } + + + @At + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.change.schoolUnion.audit") + @SLog(type = "memberChange", tag = "会员变更", msg = "校工会批量审核") + public Object doBatchApproval(@Param("data") String[] ids){ + if (ids.length == 0) { + return Result.error("未获取到选择数据"); + } + + for (String id : ids) { + BpmProcessInstance committeeInstance = dao.fetch(BpmProcessInstance.class, Cnd.where("processInstanceBusinessId", "=", id)); + BpmProcessTask committeeTask = dao.fetch(BpmProcessTask.class, Cnd.where(BpmProcessTask::getProcessInstanceId, "=", committeeInstance.getId()) + .desc(BpmProcessTask::getCreatedAt)); + + BpmTaskApprovalParam committeeParam = new BpmTaskApprovalParam(); + committeeParam.setProcessInstanceId(committeeInstance.getId()); + committeeParam.setProcessInstanceBusinessId(id); + committeeParam.setProcessInstanceTaskId(committeeTask.getId()); + committeeParam.setBpmTaskApprovalType(BpmTaskApprovalTypeEnum.PASS.name()); + committeeParam.setBpmTaskApprovalTypeEnum(BpmTaskApprovalTypeEnum.PASS); + committeeParam.setApprovalOpinion("校工会审核通过"); + + memberCommonService.compareChangeInfoAndUpdateMember(committeeParam.getProcessInstanceBusinessId()); + bpmService.completeTask(committeeParam.getProcessInstanceTaskId(), committeeParam.getBpmTaskApprovalTypeEnum(), null, null); + } + + return Result.success(); + } + + + + + @At + @ApiOperation("校工会审核撤回") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.change.schoolUnion.audit") + @SLog(tag = "会员管理-校工会管理", type = "memberSchoolUnionAudit", msg = "校工会审核撤回") + public Result revoke(@Valid String taskId) { + bpmService.revokeTask(taskId); + + // 审核通过的撤回，要将数据也改变回去 + BpmProcessTask oldTask = dao.fetch(BpmProcessTask.class, taskId); + BpmProcessInstance fetch = dao.fetch(BpmProcessInstance.class, oldTask.getProcessInstanceId()); + String businessId = fetch.getProcessInstanceBusinessId(); + + // 先查询历史记录，然后再把历史记录赋值给现在数据库存储的记录 + Sys_user_history history = dao.fetch(Sys_user_history.class, Cnd.where(Sys_user_history::getRecordId, "=", businessId)); + Sys_user info = dao.fetch(Sys_user.class, Cnd.where(Sys_user::getLoginname, "=", history.getLoginname())); + + String userId = info.getId(); + BeanUtil.copyProperties(history, info); + info.setId(userId); + dao.update(info); + dao.delete(history); + + return Result.success(); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionAuditController.java deleted file mode 100644 index 908e489d..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionAuditController.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.school; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.annotation.RepeatSubmit; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.constant.BpmProcessConstant; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; -import com.budwk.app.bpm.param.BpmTaskApprovalParam; -import com.budwk.app.bpm.service.BpmService; -import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberSchoolUnionManageService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nutz.aop.interceptor.ioc.TransAop; -import org.nutz.dao.Chain; -import org.nutz.dao.Cnd; -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.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.validation.Valid; -import java.util.List; -import java.util.Map; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberSchoolUnionAuditController - * @Date 2024/8/13 8:49 - * @注释 - */ -@Slf4j -@IocBean -@Ok("json") -@At("/platform/member/schoolUnion/audit") -public class MemberSchoolUnionAuditController { - - @Inject - private BpmService bpmService; - - @Inject - private MemberManageService memberManageService; - - @Inject - private MemberSchoolUnionManageService memberSchoolUnionManageService; - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/school/audit/index.html") - @SaCheckPermission("member.schoolUnion.audit") - public void index() { - } - - - @At - @SaCheckPermission("member.schoolUnion.audit") - public Result pageData(MemberManagePageForm pageForm) { - Pagination pageData = memberSchoolUnionManageService.getPageData(pageForm); - return Result.success(pageData); - } - - - @At - @RepeatSubmit - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.schoolUnion.audit") - @SLog(tag = "会员管理-校工会管理", type = "memberSchoolUnionAudit", msg = "校工会会员审核") - public Result approval(@Param("approval") @Valid BpmTaskApprovalParam approvalParam) { - Map variables = BeanUtil.beanToMap(approvalParam); - if (approvalParam.getBpmTaskApprovalTypeEnum().equals(BpmTaskApprovalTypeEnum.PASS)) { - MemberApplyRecord record = memberManageService.dao().fetch(MemberApplyRecord.class, Cnd.where("id", "=", approvalParam.getProcessInstanceBusinessId())); - if (StrUtil.isNotEmpty(approvalParam.getApprovalRemark())) { - memberManageService.dao().update(MemberApplyRecord.class, Chain.make("remark", approvalParam.getApprovalRemark()), Cnd.where("id", "=", record.getId())); - } - memberManageService.compareMemberChangeInfoAndUpdateUser(record); - } - bpmService.completeTask(approvalParam.getProcessInstanceTaskId(), approvalParam.getBpmTaskApprovalTypeEnum(), variables, null); - return Result.success(); - } - - - @At - @ApiOperation("校工会审核撤回") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.schoolUnion.audit") - @SLog(tag = "会员管理-校工会管理", type = "memberSchoolUnionAudit", msg = "校工会审核撤回") - public Result revoke(@Valid String taskId) { - bpmService.revokeTask(taskId); - return Result.success(); - } - - - /** - * 获取变更信息，审核 - * @param recordId - * @return - */ - @At - @SaCheckPermission(value = {"member.branchUnion.audit", "member.schoolUnion.audit"}, mode = SaMode.OR) - public Result findAuditChangeInfo(String recordId) { - Sys_user_history history = memberManageService.dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", recordId).or("id","=",recordId)); - MemberApplyRecord record = memberManageService.dao().fetch(MemberApplyRecord.class, recordId); - if (ObjectUtil.isAllEmpty(history, record)) { - return Result.error("获取变更信息失败"); - } - List nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_BRANCH_UNION_CHANGE, recordId); - if (Lang.isNotEmpty(history)) { - List nutMaps = memberManageService.compareMemberChangeInfo(history); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } - List nutMaps = memberManageService.compareMemberChangeInfo(record); - return Result.success(NutMap.NEW().addv("changeList", nutMaps).addv("nodeTasks", nodeTasks)); - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java deleted file mode 100644 index 1727a3f6..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.school; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import com.budwk.app.base.annotation.RepeatSubmit; -import com.budwk.app.base.annotation.SLog; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import lombok.extern.slf4j.Slf4j; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; -import org.nutz.mvc.annotation.Param; - -import javax.validation.Valid; -import java.util.List; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberSchoolUnionManageController - * @Date 2024/8/12 14:06 - * @注释 会员校工会管理 - */ -@IocBean -@At("/platform/member/schoolUnion/manage/list") -@Slf4j -@Ok("json") -public class MemberSchoolUnionManageController { - - @Inject - private MemberManageService memberManageService; - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/school/manage/index.html") - @SaCheckPermission("member.schoolUnion.manage.list") - public void index() { - } - - - @At - @SaCheckPermission("member.schoolUnion.manage.list") - public Result pageData(MemberManagePageForm pageForm){ - Sql sql = memberManageService.getSql(pageForm, "schoolUnion"); - Pagination pagination = memberManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); - } - - - @At - @SaCheckPermission("member.schoolUnion.manage.list") - @SLog(tag = "添加会员", type = "memberBranchManage", msg = "添加会员") - public Result addMember(@Valid MemberApplyRecord record) { - return null; - } - - - @At - @SaCheckPermission("member.schoolUnion.manage.list") - public Result getChangeInfoByUserId(String userId) { - return Result.success(memberManageService.getMemberChangeInfoByUserId(userId)); - } - - - @At - @RepeatSubmit - @SaCheckPermission("member.branchUnion.manage.list") - @SLog(tag = "校工会管理-会员管理", type = "MemberBranchManageList", msg = "校工会普通变更") - public Result generalMemberChange(@Param("record") MemberApplyRecord record, @Param("approvalRemark") String approvalRemark){ - //校工会变更，直接更改 - try { - // 校验是否有变更的字段 - List changeInfoList = memberManageService.compareMemberChangeInfo(record); - // 存储变更的类型 - List changeTypeList = memberManageService.compareMemberChangeType(changeInfoList, record); - record.setChangeTypes(changeTypeList); - record.setChangeOrigin(MemberChangeOrigin.SCHOOL_UNION.name()); - record.setRemark(approvalRemark); - memberManageService.insert(record); - memberManageService.compareMemberChangeInfoAndUpdateUser(record); - return Result.success(); - } catch (Exception e) { - e.printStackTrace(); - return Result.error(e.getMessage()); - } - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionRecordController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionRecordController.java deleted file mode 100644 index b69be012..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionRecordController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.school; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.result.Result; -import com.budwk.app.sys.models.Sys_user_history; -import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; -import lombok.extern.slf4j.Slf4j; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -import javax.validation.Valid; -import java.util.List; - -/** - * @version 1.0 - * @Author zzr - * @name：MemberSchoolRecordController - * @Date 2024/8/13 16:27 - * @注释 校工会 会员变更记录 - */ -@Slf4j -@IocBean -@Ok("json") -@At("/platform/member/schoolUnion/record") -public class MemberSchoolUnionRecordController { - - @Inject - private MemberManageService memberManageService; - - @At("") - @Ok("beetl:/platform/zhgh/staffmanage/member/school/record/index.html") - @SaCheckPermission("member.schoolUnion.record") - public void index() { - } - - @At - @SaCheckPermission("member.schoolUnion.record") - public Result pageData(MemberManagePageForm pageForm){ - Pagination pagination = memberManageService.memberHistoryRecords(pageForm); - return Result.success(pagination); - } - - - @At - @SaCheckPermission("member.schoolUnion.record") - public Result findAuditChangeInfo(@Valid String recordId) { - Sys_user_history history = memberManageService.dao().fetch(Sys_user_history.class, recordId); - List list = memberManageService.compareMemberChangeInfo(history); - return Result.success(list); - } -} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/verification/MemberBranchVerificationCheckController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberBranchVerificationCheckController.java similarity index 86% rename from src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/verification/MemberBranchVerificationCheckController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberBranchVerificationCheckController.java index 68392dc0..b7dd9464 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/branch/verification/MemberBranchVerificationCheckController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberBranchVerificationCheckController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.branch.verification; +package com.budwk.app.zhgh.staffmanage.member.controller.verification; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; @@ -12,20 +12,16 @@ import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_user; -import com.budwk.app.sys.models.Sys_user_change_info; import com.budwk.app.sys.models.Sys_user_history; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.models.MemberListVerificationProject; -import com.budwk.app.zhgh.staffmanage.member.models.MemberListVerificationUser; -import com.budwk.app.zhgh.staffmanage.member.models.MemberVerificationBranchUnionFeedback; +import com.budwk.app.zhgh.staffmanage.member.models.*; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberListVerificationPageForm; import com.budwk.app.zhgh.staffmanage.member.param.MemberVerificationBranchUnionFeedbackParam; import com.budwk.app.zhgh.staffmanage.member.param.MemberVerificationGetChangeParam; import com.budwk.app.zhgh.staffmanage.member.service.MemberListVerificationService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; @@ -65,7 +61,7 @@ public class MemberBranchVerificationCheckController { private MemberListVerificationService memberListVerificationService; @Inject - private MemberManageService memberManageService; + private MemberCommonService memberCommonService; @At("") @Ok("beetl:/platform/zhgh/staffmanage/member/branch/verification/check/index.html") @@ -113,16 +109,15 @@ public class MemberBranchVerificationCheckController { @ApiOperation("分工会 名单核对事项，单个人员变更") @SaCheckPermission("member.branchUnion.verification.check") @SLog(tag = "分工会管理-名单核对事项", type = "branchUnionVerification", msg = "分工会单个人员变更") - public Result doCheckMember(@Param("record") MemberApplyRecord record) { + public Result doCheckMember(@Param("record") MemberChangeRecord record) { if (Objects.isNull(record)) { return Result.error("数据获取失败"); } - Dao dao = memberManageService.dao(); -// memberManageService.compareMemberChangeInfoAndUpdateUser(record); + Dao dao = memberCommonService.dao(); // 校验是否有变更的东西 - memberManageService.compareMemberChangeInfo(record); + memberCommonService.compareChangeInfoAndUpdateMember(record); record.setChangeOrigin(MemberChangeOrigin.BRANCH_UNION_VERIFICATION.name()); - MemberApplyRecord applyRecord = dao.fetch(MemberApplyRecord.class, Cnd.where("userId", "=", record.getUserId()) + MemberChangeRecord applyRecord = dao.fetch(MemberChangeRecord.class, Cnd.where("userId", "=", record.getUserId()) .and("verificationProjectId", "=", record.getVerificationProjectId())); //查出当前核对事项是否有变更记录，有则修改 if (Lang.isNotEmpty(applyRecord)) { @@ -152,7 +147,7 @@ public class MemberBranchVerificationCheckController { @SaCheckPermission("member.branchUnion.verification.check") @SLog(tag = "分工会管理-名单核对事项", type = "branchUnionVerification", msg = "名单核对事项无误提交") public Result correctSubmission(@Param("data") @Valid MemberVerificationBranchUnionFeedbackParam param) { - memberManageService.dao().update(MemberVerificationBranchUnionFeedback.class, + memberCommonService.dao().update(MemberVerificationBranchUnionFeedback.class, Chain.make("isSubmit", true).add("status", "分工会无误提交") .add("welfareJson", param.getWelfareJson()), Cnd.where("verificationProjectId", "=", param.getVerificationProjectId()) @@ -189,7 +184,7 @@ public class MemberBranchVerificationCheckController { @At @SaCheckPermission("member.branchUnion.verification.check") public Result validateSubmitButton(@Valid @Param("verificationProjectId") String verificationProjectId) { - MemberVerificationBranchUnionFeedback feedback = memberManageService.dao().fetch(MemberVerificationBranchUnionFeedback.class, + MemberVerificationBranchUnionFeedback feedback = memberCommonService.dao().fetch(MemberVerificationBranchUnionFeedback.class, Cnd.where("verificationProjectId", "=", verificationProjectId).and("unionId", "=", SecurityUtil.getUnionId())); boolean flag = feedback.getBranchUnionSubmitNum() == 0 || feedback.getBranchUnionSubmit(); @@ -240,15 +235,10 @@ public class MemberBranchVerificationCheckController { @ApiOperation("分工会 名单核对事项，获取变更记录") @SaCheckPermission("member.branchUnion.verification.check") public Result getVerificationChangeInfo(@Valid @Param("data") MemberVerificationGetChangeParam param) { - MemberApplyRecord record = memberManageService.dao().fetch(MemberApplyRecord.class, + MemberChangeRecord record = memberCommonService.dao().fetch(MemberChangeRecord.class, Cnd.where("userId", "=", param.getUserId()).and("verificationProjectId", "=", param.getVerificationProjectId())); if (Lang.isNotEmpty(record)) { - Sys_user_history history = memberManageService.dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", record.getId()).desc("changeTime")); - if (Lang.isNotEmpty(history)) { - return Result.success(memberManageService.compareMemberChangeInfo(history)); - } else { - return Result.success(memberManageService.compareMemberChangeInfo(record)); - } + return Result.success(memberCommonService.getChangeInfos(record)); } return Result.error(); } @@ -258,9 +248,9 @@ public class MemberBranchVerificationCheckController { @ApiOperation("分工会 名单核对事项，查看反馈结果") @SaCheckPermission(value = {"member.branchUnion.verification.check", "member.schoolUnion.verification.check"}, mode = SaMode.OR) public Result getVerificationFeedback(String verificationProjectId, String unionId) { - MemberVerificationBranchUnionFeedback fetch = memberManageService.dao().fetch(MemberVerificationBranchUnionFeedback.class, + MemberVerificationBranchUnionFeedback fetch = memberCommonService.dao().fetch(MemberVerificationBranchUnionFeedback.class, Cnd.where("verificationProjectId", "=", verificationProjectId).and("unionId", "=", unionId)); - MemberListVerificationProject verificationProject = memberManageService.dao().fetch(MemberListVerificationProject.class, Cnd.where("id", "=", verificationProjectId)); + MemberListVerificationProject verificationProject = memberCommonService.dao().fetch(MemberListVerificationProject.class, Cnd.where("id", "=", verificationProjectId)); NutMap nutMap = Lang.obj2nutmap(verificationProject); nutMap.put("feedbackDate", DateUtil.format(DateUtil.date(fetch.getUpdatedAt()), "yyyy-MM-dd HH:mm:ss")); nutMap.put("unionName", fetch.getUnionName()); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/verification/MemberListVerificationController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberListVerificationController.java similarity index 94% rename from src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/verification/MemberListVerificationController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberListVerificationController.java index 4ce95898..871398ea 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/verification/MemberListVerificationController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberListVerificationController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.school.verification; +package com.budwk.app.zhgh.staffmanage.member.controller.verification; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.date.DateUtil; @@ -14,15 +14,11 @@ import com.budwk.app.sys.models.Sys_union; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.zhgh.benefit.mode.BenefitUserTemp; import com.budwk.app.zhgh.staffmanage.member.mode.MemberImportTemp; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.models.MemberListVerificationProject; -import com.budwk.app.zhgh.staffmanage.member.models.MemberListVerificationUser; -import com.budwk.app.zhgh.staffmanage.member.models.MemberVerificationBranchUnionFeedback; +import com.budwk.app.zhgh.staffmanage.member.models.*; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberListVerificationPageForm; import com.budwk.app.zhgh.staffmanage.member.param.MemberListVerificationParam; import com.budwk.app.zhgh.staffmanage.member.param.MemberListVerificationProjectParam; import com.budwk.app.zhgh.staffmanage.member.service.MemberListVerificationService; -import com.budwk.app.zhgh.welfare.mode.WelfareUserTemp; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; @@ -188,7 +184,7 @@ public class MemberListVerificationController { public Result removeVerificationProject(String verificationProjectId) { Dao dao = memberListVerificationService.dao(); dao.clear(MemberListVerificationProject.class, Cnd.where("id", "=", verificationProjectId)); - dao.clear(MemberApplyRecord.class, Cnd.where("verificationProjectId", "=", verificationProjectId)); + dao.clear(MemberChangeRecord.class, Cnd.where("verificationProjectId", "=", verificationProjectId)); dao.clear(MemberListVerificationUser.class, Cnd.where("verificationProjectId", "=", verificationProjectId)); dao.clear(MemberVerificationBranchUnionFeedback.class, Cnd.where("verificationProjectId", "=", verificationProjectId)); return Result.success(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/verification/MemberSchoolVerificationCheckController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberSchoolVerificationCheckController.java similarity index 85% rename from src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/verification/MemberSchoolVerificationCheckController.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberSchoolVerificationCheckController.java index ff172596..f3a5b076 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/verification/MemberSchoolVerificationCheckController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/verification/MemberSchoolVerificationCheckController.java @@ -1,4 +1,4 @@ -package com.budwk.app.zhgh.staffmanage.member.controller.school.verification; +package com.budwk.app.zhgh.staffmanage.member.controller.verification; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -6,7 +6,6 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.json.JSONObject; import com.budwk.app.base.annotation.RepeatSubmit; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; @@ -16,16 +15,12 @@ import com.budwk.app.sys.models.Sys_user; import com.budwk.app.sys.models.Sys_user_change_info; import com.budwk.app.sys.models.Sys_user_history; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; -import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; -import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; -import com.budwk.app.zhgh.staffmanage.member.models.MemberListVerificationProject; -import com.budwk.app.zhgh.staffmanage.member.models.MemberListVerificationUser; -import com.budwk.app.zhgh.staffmanage.member.models.MemberVerificationBranchUnionFeedback; +import com.budwk.app.zhgh.staffmanage.member.models.*; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberListVerificationPageForm; import com.budwk.app.zhgh.staffmanage.member.param.MemberSchoolVerificationSubmitParam; import com.budwk.app.zhgh.staffmanage.member.param.MemberVerificationGetChangeParam; import com.budwk.app.zhgh.staffmanage.member.service.MemberListVerificationService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; @@ -33,9 +28,7 @@ import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; -import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; -import org.nutz.dao.util.cri.Static; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -68,7 +61,7 @@ public class MemberSchoolVerificationCheckController { private MemberListVerificationService memberListVerificationService; @Inject - private MemberManageService memberManageService; + private MemberCommonService memberCommonService; @At("") @Ok("beetl:/platform/zhgh/staffmanage/member/school/verification/check/index.html") @@ -96,15 +89,10 @@ public class MemberSchoolVerificationCheckController { @At @SaCheckPermission("member.schoolUnion.verification.check") public Result getVerificationChangeInfo(@Valid @Param("data") MemberVerificationGetChangeParam param) { - MemberApplyRecord record = memberManageService.dao().fetch(MemberApplyRecord.class, + MemberChangeRecord record = memberCommonService.dao().fetch(MemberChangeRecord.class, Cnd.where("userId", "=", param.getUserId()).and("verificationProjectId", "=", param.getVerificationProjectId())); if (Lang.isNotEmpty(record)) { - Sys_user_history history = memberManageService.dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", record.getId()).desc("changeTime")); - if (Lang.isNotEmpty(history)) { - return Result.success(memberManageService.compareMemberChangeInfo(history)); - } else { - return Result.success(memberManageService.compareMemberChangeInfo(record)); - } + return Result.success(memberCommonService.getChangeInfos(record)); } return Result.success(); } @@ -126,18 +114,18 @@ public class MemberSchoolVerificationCheckController { Chain chain = Chain.make("schoolUnionChecked", true); chain.add("verificationOption", param.getOption()); - MemberApplyRecord record = memberManageService.dao().fetch(MemberApplyRecord.class, + MemberChangeRecord record = memberCommonService.dao().fetch(MemberChangeRecord.class, Cnd.where("userId", "=", param.getUserId()) .and("verificationProjectId", "=", param.getVerificationProjectId())); if (param.getFlag()) { chain.add("currentState", 2); - memberManageService.compareMemberChangeInfoAndUpdateUser(record); + memberCommonService.compareChangeInfoAndUpdateMember(record); } else { chain.add("currentState", 1); - memberManageService.update(record); + memberCommonService.update(record); } - memberManageService.dao().update(MemberListVerificationUser.class, chain, + memberCommonService.dao().update(MemberListVerificationUser.class, chain, Cnd.where("userId", "=", param.getUserId()).and("verificationProjectId", "=", param.getVerificationProjectId())); return Result.success(); } @@ -148,19 +136,19 @@ public class MemberSchoolVerificationCheckController { @SaCheckPermission("member.schoolUnion.verification.check") @SLog(type = "member", tag = "名单核对事项", msg = "校工会提交") public Result schoolVerificationSubmit(@Valid @Param("data") MemberSchoolVerificationSubmitParam param) { - MemberVerificationBranchUnionFeedback fetch = memberManageService.dao().fetch(MemberVerificationBranchUnionFeedback.class, + MemberVerificationBranchUnionFeedback fetch = memberCommonService.dao().fetch(MemberVerificationBranchUnionFeedback.class, Cnd.where("verificationProjectId", "=", param.getVerificationProjectId()) .and("unionId", "=", param.getUnionId())); fetch.setSchoolUnionSubmit(true); fetch.setSchoolUnionSubmitNum(fetch.getSchoolUnionSubmitNum() + 1); fetch.setStatus("待分工会重新提交"); // 更新反馈表的数据，校工会提交置为true - memberManageService.dao().update(fetch); + memberCommonService.dao().update(fetch); Cnd cnd = Cnd.NEW(); cnd.and("unionId", "=", param.getUnionId()); cnd.and("verificationProjectId", "=", param.getVerificationProjectId()); - memberManageService.dao().update(MemberListVerificationUser.class, + memberCommonService.dao().update(MemberListVerificationUser.class, Chain.make("branchUnionChecked", false).add("schoolUnionChecked", true), cnd); return Result.success(); @@ -179,7 +167,7 @@ public class MemberSchoolVerificationCheckController { @SaCheckPermission("member.schoolUnion.verification.check") public Result getChangeTypeUserPageData(MemberListVerificationPageForm pageForm) { Sql sql = memberListVerificationService.getChangeTypeUserSql(pageForm); - Pagination pagination = memberManageService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + Pagination pagination = memberCommonService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); } @@ -189,7 +177,7 @@ public class MemberSchoolVerificationCheckController { @SaCheckPermission("member.schoolUnion.verification.check") public void exportChangeTypeUserByUnionIdExcel(MemberListVerificationPageForm pageForm, HttpServletResponse response) { Sql sql = memberListVerificationService.getChangeTypeUserSql(pageForm); - List list = memberManageService.listMap(sql); + List list = memberCommonService.listMap(sql); List excelExportEntities = memberListVerificationService.buildExportEntities(); NutMap nutMap = list.stream().findFirst().orElse(NutMap.NEW()); String labelName = ""; @@ -215,9 +203,9 @@ public class MemberSchoolVerificationCheckController { @Ok("void") @SaCheckPermission("member.schoolUnion.verification.check") public void exportAllChangeTypeUserExcel(MemberListVerificationPageForm pageForm, HttpServletResponse response){ - MemberListVerificationProject project = memberManageService.dao().fetch(MemberListVerificationProject.class, pageForm.getVerificationProjectId()); + MemberListVerificationProject project = memberCommonService.dao().fetch(MemberListVerificationProject.class, pageForm.getVerificationProjectId()); Sql sql = memberListVerificationService.getChangeTypeUserSql(pageForm); - List list = memberManageService.listMap(sql); + List list = memberCommonService.listMap(sql); List excelExportEntities = memberListVerificationService.buildExportEntities(); String labelName = ""; switch (pageForm.getChangeType()) { @@ -244,13 +232,13 @@ public class MemberSchoolVerificationCheckController { @ApiOperation("校工会 名单核对事项，单个人员变更") @SaCheckPermission("member.schoolUnion.verification.check") @SLog(tag = "校工会管理-名单核对事项", type = "schoolUnionVerification", msg = "校工会单个人员变更") - public Result doCheckMember(@Param("record") MemberApplyRecord record){ + public Result doCheckMember(@Param("record") MemberChangeRecord record){ if (Objects.isNull(record)) { return Result.error("数据获取失败"); } - Dao dao = memberManageService.dao(); + Dao dao = memberCommonService.dao(); record.setChangeOrigin(MemberChangeOrigin.SCHOOL_UNION_VERIFICATION.name()); - MemberApplyRecord applyRecord = dao.fetch(MemberApplyRecord.class, Cnd.where("userId", "=", record.getUserId()) + MemberChangeRecord applyRecord = dao.fetch(MemberChangeRecord.class, Cnd.where("userId", "=", record.getUserId()) .and("verificationProjectId", "=", record.getVerificationProjectId())); // 如果之前有变更，删除之前记录 if (Lang.isNotEmpty(applyRecord)) { @@ -271,7 +259,7 @@ public class MemberSchoolVerificationCheckController { .and("verificationProjectId", "=", record.getVerificationProjectId())); dao.clear(Sys_user_history.class, Cnd.where("recordId", "=", record.getId())); - memberManageService.compareMemberChangeInfoAndUpdateUser(record); + memberCommonService.compareChangeInfoAndUpdateMember(record); dao.update(MemberListVerificationUser.class, Chain.make("schoolUnionChecked", true).add("currentState", 2), @@ -289,13 +277,13 @@ public class MemberSchoolVerificationCheckController { @SLog(tag = "校工会管理-名单核对事项", type = "schoolUnionVerification", msg = "退回分工会无误提交") public Result doRollback(@Valid @Param("id") String id, @Valid @Param("rollbackReason") String rollbackReason){ - MemberVerificationBranchUnionFeedback feedback = memberManageService.dao().fetch(MemberVerificationBranchUnionFeedback.class, + MemberVerificationBranchUnionFeedback feedback = memberCommonService.dao().fetch(MemberVerificationBranchUnionFeedback.class, Cnd.where("id", "=", id)); feedback.setIsRollback(true); feedback.setRollbackReason(rollbackReason); feedback.setSchoolUnionSubmitNum(feedback.getSchoolUnionSubmitNum() + 1); feedback.setStatus("校工会退回"); - memberManageService.dao().update(feedback); + memberCommonService.dao().update(feedback); return Result.success(); } @@ -305,7 +293,7 @@ public class MemberSchoolVerificationCheckController { @Ok("void") @SaCheckPermission("member.schoolUnion.verification.check") public void doExportByPageDataForExcel(MemberListVerificationPageForm pageForm, HttpServletResponse response){ - MemberListVerificationProject project = memberManageService.dao().fetch(MemberListVerificationProject.class, pageForm.getVerificationProjectId()); + MemberListVerificationProject project = memberCommonService.dao().fetch(MemberListVerificationProject.class, pageForm.getVerificationProjectId()); List mapList = memberListVerificationService.getSchoolListVerificationUnion(pageForm); mapList.forEach(v-> { v.put("branchUnionSubmit" ,v.getBoolean("branchUnionSubmit") ? "已提交" : "未提交"); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java new file mode 100644 index 00000000..efd3e136 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplyBranchApprovalInterceptor.java @@ -0,0 +1,93 @@ +package com.budwk.app.zhgh.staffmanage.member.interceptor; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; +import com.budwk.app.sys.models.Sys_role; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.sys.models.Sys_user_role; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import com.budwk.app.zhgh.staffmanage.specialstaff.model.SpecialStaff; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.json.Json; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberApplyBranchApprovalInterceptor + * @Date 2025/7/29 17:14 + * @注释 + */ +public class MemberApplyBranchApprovalInterceptor implements FlowInterceptor { + + @Override + public void intercept(Execution execution) { + System.out.println("member apply branch approval .................."); + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + MemberApplyRecord record = Json.fromJson(MemberApplyRecord.class, formDataStr); + + Dao dao = ServiceContext.find(Dao.class); + + // 如果是HMC，分工会接收，要判断更会关系有没有变化，然后再去改变用户数据 + boolean submitType = execution.getArgs().getInt("submitType").equals(ProcessSubmitTypeEnum.AGREE.getCode()); + if (submitType) { + if ("HMC".equals(record.getOrigin())) { + // 判断是否改变了工会关系 + View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", record.getUserId())); + + if (!ObjectUtil.equals(user.getUnionId(), record.getAllocationUnionId())) { + // 去判断特殊人员表里面有没有这些人，有的话先删除再增加 + if (dao.count(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())) > 0) { + dao.clear(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())); + user = dao.fetch(View_user.class, Cnd.where("id", "=", record.getUserId())); + } + + // 获取分配工会信息 + Sys_union union = dao.fetch(Sys_union.class, Cnd.where("id", "=", record.getAllocationUnionId())); + SpecialStaff staff = new SpecialStaff(); + staff.setUserId(record.getUserId()); + staff.setPersonnelRelationUnitId(user.getUnitId()); + staff.setPersonnelRelationUnitName(user.getUnitName()); + staff.setUnionRelationUnionId(union.getId()); + staff.setUnionRelationUnionName(union.getName()); + staff.setIsManyUnit(false); + staff.setSpecialStaffType("HMC_RELATION"); + dao.insert(staff); + } + + Sys_user sysUser = new Sys_user(); + BeanUtil.copyProperties(record, sysUser); + sysUser.setId(record.getUserId()); + sysUser.setMember(true); + // 这是HMC的 + sysUser.setPreparedBy("会员"); + dao.updateIgnoreNull(sysUser); + + // 还要设置会员角色 + Sys_role role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.MEMBER.name())); + + int count = dao.count(Sys_user_role.class, Cnd.where("userId", "=", user.getId()).and("roleId", "=", role.getId())); + if (count == 0) { + Sys_user_role userRole = new Sys_user_role(); + userRole.setUserId(user.getId()); + userRole.setRoleId(role.getId()); + dao.insert(userRole); + } + + // 短信啊，TMD HMC，狗屎 + } else { + // 其他的高校，发短信给下一步（校工会）审核 + } + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySaveInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySaveInterceptor.java new file mode 100644 index 00000000..84c8ead8 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySaveInterceptor.java @@ -0,0 +1,47 @@ +package com.budwk.app.zhgh.staffmanage.member.interceptor; + +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.web.commons.base.Globals; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.json.Json; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberApplySaveInterceptor + * @Date 2025/7/28 16:39 + * @注释 + */ +public class MemberApplySaveInterceptor implements FlowInterceptor { + + @Override + public void intercept(Execution execution) { + System.out.println("member apply .................."); + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + // 设置流程变量 + if ("HMC".equals(Globals.SchoolCode)) { + execution.getArgs().set("origin", "HMC"); + } else { + execution.getArgs().set("origin", "OTHER"); + } + + MemberApplyRecord record = Json.fromJson(MemberApplyRecord.class, formDataStr); + + Dao dao = ServiceContext.find(Dao.class); + dao.insertOrUpdate(record); + + execution.getArgs().set(FlowConst.FORM_DATA, Json.toJson(record)); + + int instanceId = execution.getArgs().getInt(FlowConst.PROCESS_INSTANCE_ID_KEY); + dao.update(ProcessInstance.class, Chain.make("businessNo", record.getId()), Cnd.where(ProcessInstance::getId, "=", instanceId)); + + System.out.println(execution); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java new file mode 100644 index 00000000..f2ecb869 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java @@ -0,0 +1,53 @@ +package com.budwk.app.zhgh.staffmanage.member.interceptor; + +import cn.hutool.core.bean.BeanUtil; +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.json.Json; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberApplySchoolApprovalInterceptor + * @Date 2025/7/29 15:34 + * @注释 + */ +public class MemberApplySchoolApprovalInterceptor implements FlowInterceptor { + + @Override + public void intercept(Execution execution) { + System.out.println("member apply school approval .................."); + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + MemberApplyRecord record = Json.fromJson(MemberApplyRecord.class, formDataStr); + String allocationUnionId = execution.getArgs().getStr(FlowConst.TASK_FORM_DATA_PREFIX + "allocation_unionId"); + + Dao dao = ServiceContext.find(Dao.class); + dao.update(MemberApplyRecord.class, Chain.make("allocationUnionId", allocationUnionId), + Cnd.where(MemberApplyRecord::getId, "=", record.getId())); + + // 判断如果是审核通过，并且不是HMC, 去修改用户表的基础数据 + boolean submitType = execution.getArgs().getInt("submitType").equals(ProcessSubmitTypeEnum.AGREE.getCode()); + if (submitType) { + if (!"HMC".equals(record.getOrigin())) { + Sys_user sysUser = new Sys_user(); + BeanUtil.copyProperties(record, sysUser); + sysUser.setId(record.getUserId()); + dao.updateIgnoreNull(sysUser); + // 正常的发送短信，审核通过 + } else { + // 发TMD短信 HMC，流程在流转到分工会接收环节 + } + } else { + // 没审核通过，发短信告知本人 + } + + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberChangeSaveInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberChangeSaveInterceptor.java new file mode 100644 index 00000000..3d6629bb --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberChangeSaveInterceptor.java @@ -0,0 +1,68 @@ +package com.budwk.app.zhgh.staffmanage.member.interceptor; + +import cn.hutool.core.date.DateUtil; +import com.budwk.app.base.exception.BaseException; +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.json.Json; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; + +import java.util.Date; +import java.util.List; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberChangeSaveInterceptor + * @Date 2025/7/28 16:39 + * @注释 + */ +public class MemberChangeSaveInterceptor implements FlowInterceptor { + + @Override + public void intercept(Execution execution) { + System.out.println("member change .................."); + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + MemberChangeRecord record = Json.fromJson(MemberChangeRecord.class, formDataStr); + + Dao dao = ServiceContext.find(Dao.class); + MemberCommonService memberCommonService = ServiceContext.find(MemberCommonService.class); + + // 校验有没有发生变更 + List changeInfos = memberCommonService.getChangeInfos(record); + if (Lang.isEmpty(changeInfos)) { + throw new BaseException("未获取到异动数据"); + } + + View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", record.getUserId())); + // 比较有哪些变更类型 + List changeTypes = memberCommonService.compareChangeType(record, user); + + record.setChangeTypes(changeTypes); + record.setUserId(SecurityUtil.getUserId()); + // 变更来源 个人 + record.setChangeOrigin(MemberChangeOrigin.PERSONAL.name()); + + dao.insertOrUpdate(record); + + execution.getArgs().set(FlowConst.FORM_DATA, Json.toJson(record)); + + int instanceId = execution.getArgs().getInt(FlowConst.PROCESS_INSTANCE_ID_KEY); + dao.update(ProcessInstance.class, Chain.make("businessNo", record.getId()), Cnd.where(ProcessInstance::getId, "=", instanceId)); + + System.out.println(execution); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberChangeSchoolApprovalInterceptor.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberChangeSchoolApprovalInterceptor.java new file mode 100644 index 00000000..fee055f4 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberChangeSchoolApprovalInterceptor.java @@ -0,0 +1,37 @@ +package com.budwk.app.zhgh.staffmanage.member.interceptor; + +import com.budwk.app.flow.constant.FlowConst; +import com.budwk.app.flow.engine.FlowInterceptor; +import com.budwk.app.flow.engine.core.Execution; +import com.budwk.app.flow.engine.core.ServiceContext; +import com.budwk.app.flow.enums.ProcessSubmitTypeEnum; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; +import org.nutz.json.Json; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberChangeSchoolApprovalInterceptor + * @Date 2025/7/30 9:06 + * @注释 + */ +public class MemberChangeSchoolApprovalInterceptor implements FlowInterceptor { + + @Override + public void intercept(Execution execution) { + System.out.println("member change school approval .................."); + String formDataStr = execution.getArgs().getStr(FlowConst.FORM_DATA); + MemberChangeRecord record = Json.fromJson(MemberChangeRecord.class, formDataStr); + + MemberCommonService memberCommonService = ServiceContext.find(MemberCommonService.class); + // 是否审核通过 + boolean submitType = execution.getArgs().getInt("submitType").equals(ProcessSubmitTypeEnum.AGREE.getCode()); + // 审核通过后去修改用户表字段 + if (submitType) { + memberCommonService.compareChangeInfoAndUpdateMember(record); + } else { + // 没审核通过的操作 + } + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java index dd355a59..d610ed2f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java @@ -52,6 +52,11 @@ public class MemberApplyRecord extends BaseModel { @Size(max = 100) private String loginname; + @Column + @Comment("出生日期") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String birthday; + @Column @Comment("单位id") @ColDefine(type = ColType.VARCHAR, width = 32) @@ -59,12 +64,6 @@ public class MemberApplyRecord extends BaseModel { @Size(max = 32) private String unitId; - @Column - @Comment("变更单位id") - @ColDefine(type = ColType.VARCHAR, width = 32) - @Size(max = 32) - private String changeUnitId; - @Column @Comment("单位名称") @ColDefine(type = ColType.VARCHAR, width = 200) @@ -79,12 +78,6 @@ public class MemberApplyRecord extends BaseModel { @Size(max = 32) private String unionId; - @Column - @Comment("变更工会id") - @ColDefine(type = ColType.VARCHAR, width = 32) - @Size(max = 32) - private String changeUnionId; - @Column @Comment("工会名称") @ColDefine(type = ColType.VARCHAR, width = 50) @@ -128,11 +121,10 @@ public class MemberApplyRecord extends BaseModel { private String education; @Column - @Comment("党政职务") + @Comment("职务") @ColDefine(type = ColType.VARCHAR, width = 50) - @NotBlank(message = "党政职务不能为空") @Size(max = 50) - private String governmentPosition; + private String position; @Column @Comment("在职状态") @@ -169,13 +161,6 @@ public class MemberApplyRecord extends BaseModel { @Size(max = 255) private String email; - @Column - @Comment("是否愿意加入大病互助基金会") - @ColDefine(type = ColType.BOOLEAN) - @Default(value = "0") - @NotNull(message = "愿意加入大病互助基金会不能为空") - private Boolean wantJoinLoveMutualAidAssociation; - @Column @Comment("会员状态") @ColDefine(type = ColType.BOOLEAN) @@ -188,6 +173,11 @@ public class MemberApplyRecord extends BaseModel { @Default(value = "0") private Boolean welfareMember; + @Column + @Comment("校区") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String campus; + @Column @Comment("家庭主要成员及其工作单位") @ColDefine(type = ColType.MYSQL_JSON) @@ -211,7 +201,7 @@ public class MemberApplyRecord extends BaseModel { @Column @Comment("变更类型") - @ColDefine(type = ColType.VARCHAR, width = 20) + @ColDefine(type = ColType.VARCHAR, width = 50) private String changeType; @Column @@ -231,20 +221,22 @@ public class MemberApplyRecord extends BaseModel { private Date applyDateTime; @Column - @Comment("名单事项核对Id") - @ColDefine(type = ColType.VARCHAR, width = 32) - private String verificationProjectId; - - private Boolean edit; + @Comment("分配的工会关系") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String allocationUnionId; @Column - @Comment("详细变更记录") - @ColDefine(type = ColType.TEXT) - private String changeInfos; - + @Comment("是否自愿加入工会") + @ColDefine(type = ColType.BOOLEAN) + private Boolean isVoluntary; @Column - @Comment("详细变更记录") - @ColDefine(type = ColType.TEXT) - private String remark; + @Comment("签字") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String sign; + + @Column + @Comment("来源，高校编码") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String origin; } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java new file mode 100644 index 00000000..059ea0c2 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberChangeRecord.java @@ -0,0 +1,225 @@ +package com.budwk.app.zhgh.staffmanage.member.models; + +import cn.hutool.json.JSONObject; +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; + +/** + * 会员变更记录 + * + * @author: 1V + * @date: 2021/1/25 + * @since 1.0 + */ +@Data +@Accessors(chain = true) +@Table("member_change_record") +@EqualsAndHashCode(callSuper = true) +public class MemberChangeRecord extends BaseModel { + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("用户id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Size(max = 32) + private String userId; + + @Column + @Comment("姓名") + @ColDefine(type = ColType.VARCHAR, width = 100) + @Size(max = 100) + private String username; + + @Column + @Comment("工号") + @ColDefine(type = ColType.VARCHAR, width = 100) + @Size(max = 100) + private String loginname; + + @Column + @Comment("单位id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Size(max = 32) + private String unitId; + + @Column + @Comment("单位名称") + @ColDefine(type = ColType.VARCHAR, width = 200) + @Size(max = 200) + private String unitName; + + @Column + @Comment("工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Size(max = 32) + private String unionId; + + @Column + @Comment("工会名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Size(max = 50) + private String unionName; + + @Column + @Comment("性别") + @ColDefine(type = ColType.VARCHAR, width = 10) + @Size(max = 10) + private String sex; + + @Column + @Comment("出生日期") + @ColDefine(type = ColType.VARCHAR, width = 10) + @Size(max = 10) + private String birthday; + + @Column + @Comment("证件号码") + @ColDefine(type = ColType.VARCHAR, width = 30) + @Size(max = 30) + private String idCard; + + @Column + @Comment("民族") + @ColDefine(type = ColType.VARCHAR, width = 20) + @Size(max = 20) + private String nation; + + @Column + @Comment("政治面貌") + @ColDefine(type = ColType.VARCHAR, width = 100) + @Size(max = 100) + private String political; + + @Column + @Comment("学历") + @ColDefine(type = ColType.VARCHAR, width = 20) + @Size(max = 20) + private String education; + + @Column + @Comment("学位") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String academicDegree; + + @Column + @Comment("党政职务") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Size(max = 50) + private String position; + + @Column + @Comment("在职状态") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Size(max = 50) + private String userState; + + @Column + @Comment("人事编制") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Size(max = 50) + private String preparedBy; + + @Column + @Comment("人员类别") + @ColDefine(type = ColType.VARCHAR, width = 50) + @Size(max = 50) + private String personType; + + @Column + @Comment("手机号码") + @ColDefine(type = ColType.VARCHAR, width = 32) + @Size(max = 32) + private String mobile; + + @Column + @Comment("电子邮箱") + @ColDefine(type = ColType.VARCHAR, width = 255) + @Size(max = 255) + private String email; + + @Column + @Comment("会员状态") + @ColDefine(type = ColType.BOOLEAN) + @Default(value = "0") + private Boolean member; + + @Column + @Comment("福利会员状态") + @ColDefine(type = ColType.BOOLEAN) + @Default(value = "0") + private Boolean welfareMember; + + @Column + @Comment("校区") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String campus; + + @Column + @Comment("退休日期") + @ColDefine(type = ColType.DATE) + private Date retireDate; + + @Column + @Comment("家庭主要成员及其工作单位") + @ColDefine(type = ColType.MYSQL_JSON) + private List families; + + @Column + @Comment("个人简况") + @ColDefine(type = ColType.VARCHAR, customType = "text") + private String personalData; + + @Column + @Comment("备注") + @ColDefine(type = ColType.VARCHAR, width = 255) + private String notes; + + @Column + @Comment("变更类型") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String changeType; + + @Column + @Comment("变更类型集合") + @ColDefine(type = ColType.MYSQL_JSON) + private List changeTypes; + + @Column + @Comment("变更来源") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String changeOrigin; + + @Column + @Comment("申请时间") + @ColDefine(type = ColType.DATETIME) + @PrevInsert(now = true) + private Date applyDateTime; + + @Column + @Comment("福利享受截止日期") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String welfareStopDate; + + @Column + @Comment("名单事项核对Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String verificationProjectId; + + @Comment("备注（南邮的）") + @ColDefine(type = ColType.TEXT) + private String remark; + + private Boolean edit; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java index b52455e3..56ebdc47 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberApplyPageForm.java @@ -35,14 +35,14 @@ public class MemberApplyPageForm extends PageForm { } if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.or("vu.loginname", "like", "%" + pageForm.getSearchKeyword() + "%"); - seg.or("vu.username", "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or("info.loginName", "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or("info.username", "like", "%" + pageForm.getSearchKeyword() + "%"); cnd.and(seg); } - cnd.andEX("vu.unionId","=",pageForm.getUnionId()); - cnd.andEX("vu.unitId","=",pageForm.getUnitId()); - cnd.andEX("vu.userState","=",pageForm.getUserState()); - cnd.andEX("vu.personType","=",pageForm.getPersonType()); - cnd.andEX("vu.preparedBy","=",pageForm.getPreparedBy()); + cnd.andEX("info.unionId","=",pageForm.getUnionId()); + cnd.andEX("info.unitId","=",pageForm.getUnitId()); + cnd.andEX("info.userState","=",pageForm.getUserState()); + cnd.andEX("info.personType","=",pageForm.getPersonType()); + cnd.andEX("info.preparedBy","=",pageForm.getPreparedBy()); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java new file mode 100644 index 00000000..0522a4c0 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberChangePageForm.java @@ -0,0 +1,62 @@ +package com.budwk.app.zhgh.staffmanage.member.param.pageform; + +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.Cnd; +import org.nutz.dao.util.cri.SqlExpressionGroup; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberChangePageForm + * @Date 2025/2/14 14:05 + * @注释 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MemberChangePageForm extends PageForm { + + // 工会id + @ApiModelProperty("工会id") + private String unionId; + + // 单位id + @ApiModelProperty("单位id") + private String unitId; + + // 在职状态 + @ApiModelProperty("在职状态") + private String userState; + + // 在职状态 + @ApiModelProperty("编制类型") + private String preparedBy; + + // 人员类型 + @ApiModelProperty("人员类型") + private String personType; + + + public void buildSearch(Cnd cnd, String prefix){ + if (cnd == null) { + cnd = Cnd.NEW(); + } + + if (StrUtil.isNotBlank(this.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike(prefix + "username", this.getSearchKeyword()); + seg.orLike(prefix + "loginname", this.getSearchKeyword()); + cnd.and(seg); + } + + cnd.andEX(prefix + "unionId", "=", this.getUnionId()); + cnd.andEX(prefix + "unitId", "=", this.getUnitId()); + cnd.andEX(prefix + "userState", "=", this.getUserState()); + cnd.andEX(prefix + "preparedBy", "=", this.getPreparedBy()); + cnd.andEX(prefix + "personType", "=", this.getPersonType()); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java index 5f861b57..8f061be1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberManagePageForm.java @@ -64,7 +64,11 @@ public class MemberManagePageForm extends PageForm { cnd = Cnd.NEW(); } if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { + cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); + } else { + cnd.and("record.userId", "=", SecurityUtil.getUserId()); + } } else { cnd.andEX("u.unionId", "=", pageForm.getUnionId()); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberManageService.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberCommonService.java similarity index 55% rename from src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberManageService.java rename to src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberCommonService.java index e11a2095..614adce2 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberManageService.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/MemberCommonService.java @@ -3,15 +3,15 @@ package com.budwk.app.zhgh.staffmanage.member.service; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.BaseService; import com.budwk.app.sys.models.Sys_user; -import com.budwk.app.sys.models.Sys_user_history; +import com.budwk.app.sys.views.View_user; import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; +import com.budwk.app.zhgh.staffmanage.member.models.MemberChangeRecord; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; import org.nutz.dao.sql.Sql; import org.nutz.lang.util.NutMap; import java.util.List; import java.util.Map; -import java.util.Set; /** * @version 1.0 @@ -20,7 +20,7 @@ import java.util.Set; * @Date 2024/8/6 10:42 * @注释 */ -public interface MemberManageService extends BaseService { +public interface MemberCommonService extends BaseService { /** * 多条件查询Sql @@ -43,43 +43,47 @@ public interface MemberManageService extends BaseService { */ Pagination memberHistoryRecords(MemberManagePageForm pageForm); - /** - * 根据用户id获取会员变更信息（时间线）,所有的变更记录 - * @param userId 用户id - * @return List - */ - List getMemberChangeInfoByUserId(String userId); /** - * 会员变更信息对比 - * @param current 当前数据 - * @param previous 上一条数据 + * 获取可变更字段 * @return */ - List compareChange(Sys_user_history current, Sys_user_history previous, Set allowChangeFieldNames, Map dictMap); - - List compareMemberChangeInfo(Sys_user_history history); + NutMap getDictAllowChangeFields(); /** - * 校验是否有变更 - * @param record - */ - List compareMemberChangeInfo(MemberApplyRecord record); - - /** - * 获取变更类型 - * @param changeList 变更记录 + * 获取变更详情 + * @param recordId 变更记录id * @return */ - List compareMemberChangeType(List changeList, MemberApplyRecord record); + List getChangeInfos(String recordId); + List getChangeInfos(MemberChangeRecord record); /** - * 会员变更信息对比 并更新数据 + * 比较有哪些变更类型 + * @param record + * @param user + * @return + */ + List compareChangeType(MemberChangeRecord record, View_user user); + + /** + * 存储比较变更信息并更新会员信息 + * @param recordId + */ + void compareChangeInfoAndUpdateMember(String recordId); + /** + * 存储比较变更信息并更新会员信息 * @param record */ - void compareMemberChangeInfoAndUpdateUser(MemberApplyRecord record); + void compareChangeInfoAndUpdateMember(MemberChangeRecord record); + /** + * 获取会员的变更信息 + * @param userId + * @return + */ + List getAllChangeInfo(String userId); /** * 比较两个对象，并记录变更的字段工具 @@ -90,12 +94,4 @@ public interface MemberManageService extends BaseService { * @param changeList 变更集合 */ void extractChange(NutMap newMap, NutMap sourceMap, String fieldName, Map fieldsMap, List changeList); - - /** - * 获取会员变更信息,memberApplyRecord表中名单核对事项人员与sys_user表中人员对比 - * @param userId - * @param verificationProjectId - * @return - */ - List getLastTimeMemberChangeInfoByUserId(String userId, String verificationProjectId); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberBranchUnionManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberBranchUnionManageServiceImpl.java index ee6cb0e4..d2437646 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberBranchUnionManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberBranchUnionManageServiceImpl.java @@ -42,8 +42,8 @@ public class MemberBranchUnionManageServiceImpl extends BaseServiceImpl implements MemberManageService { +public class MemberManageServiceImpl extends BaseServiceImpl implements MemberCommonService { @Inject private SysDictService sysDictService; + @Inject + private SysRoleService sysRoleService; + @Inject + private SysUserService sysUserService; public MemberManageServiceImpl(Dao dao) { super(dao); @@ -83,7 +90,6 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement u.personType, u.welfareMember, u.isModelWorker, - u.wantJoinLoveMutualAidAssociation, his.id hisId, his.changeTypes, his.changeTime @@ -96,7 +102,8 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement MemberManagePageForm.buildSearch(cnd, pageForm); cnd.desc("his.changeTime"); cnd.groupBy("u.id"); - if ("branchUnion".equals(queryType)) { + + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("u.unionId", "=", SecurityUtil.getUnionId()); } sql.setCondition(cnd); @@ -192,316 +199,281 @@ public class MemberManageServiceImpl extends BaseServiceImpl implement cnd.desc("his.changeTime"); } - if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_MEMBER_ADMIN.name())) { cnd.andEX("his.unionId", "=", SecurityUtil.getUnionId()); } sql.setCondition(cnd); return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); } - /** - * 根据用户id获取用户变更信息 - * - * @param userId 用户id - * @return - */ + @Override - public List getMemberChangeInfoByUserId(String userId) { - Sys_user user = dao().fetch(Sys_user.class, userId); - Sys_user_history history = new Sys_user_history(); - //获取当前用户信息 - BeanUtil.copyProperties(user, history); - history.setChangeTime(new Date()); - //获取用户变更信息 - List userHistories = dao().query(Sys_user_history.class, Cnd.where("loginname", "=", user.getLoginname())); - userHistories.add(history); - //按时间排序 - CollectionUtil.sort(userHistories, Comparator.comparing(Sys_user_history::getChangeTime).reversed()); - - //获取允许变更的字段 - List dictList = sysDictService.getSubListByCode("MEMBER_ALLOW_CHANGES_FIELD"); + public NutMap getDictAllowChangeFields() { + //获取可变更字段 + List dictList = sysDictService.getSubListByCode("ALLOW_CHANGE_FIELDS"); Set allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet()); + allowChangeFieldNames.add("member"); Map dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName)); - - List resultList = new ArrayList<>(); - for (int i = 1; i < userHistories.size(); i++) { - Sys_user_history current = userHistories.get(i); - Sys_user_history previous = userHistories.get(i - 1); - NutMap nutMap = compareAndRecordChange(current, previous, allowChangeFieldNames, dictMap); - resultList.add(nutMap); - } - return resultList; + dictMap.put("member", "会员状态"); + return NutMap.NEW().addv("allowChangeFieldNames", allowChangeFieldNames).addv("dictMap", dictMap); } - - /** - * 比较两个对象，并记录变更的字段 - * - * @param current 当前数据 - * @param previous 上一次的数据 - * @param allowChangeFieldNames 允许变更的字段名 - * @param dictMap 字典数据 - * @return NutMap - */ - public NutMap compareAndRecordChange(Sys_user_history current, Sys_user_history previous, Set allowChangeFieldNames, Map dictMap) { - NutMap nutMap = NutMap.NEW(); - if (StrUtil.isNotBlank(current.getChangeOrigin())) { - String title = MemberChangeOrigin.valueOf(MemberChangeOrigin.class , current.getChangeOrigin()).changeOriginName; - nutMap.put("title", title + "(" + DateUtil.format(current.getChangeTime(), "yyyy-MM-dd HH:mm:ss") + ")"); + @Override + public List getChangeInfos(String recordId) { + Sys_user_history history = dao().fetch(Sys_user_history.class, Cnd.where("recordId", "=", recordId)); + if (Lang.isNotEmpty(history)) { + return history.getChangeInfos(); } else { - nutMap.put("title", DateUtil.format(current.getChangeTime(), "yyyy-MM-dd HH:mm:ss")); + MemberChangeRecord record = dao().fetch(MemberChangeRecord.class, recordId); + return getChangeInfos(record); } - nutMap.put("remark", current.getRemark()); - - nutMap.put("changeTime", DateUtil.format(current.getChangeTime(), "yyyy-MM-dd HH:mm:ss")); - List changeList = new ArrayList<>(); - - NutMap currentMap = Lang.obj2nutmap(current); - NutMap previousMap = Lang.obj2nutmap(previous); - - for (String fieldName : allowChangeFieldNames) { - extractChange(currentMap, previousMap, fieldName, dictMap, changeList); - } - nutMap.put("changeList", changeList); - return nutMap; } - - /** - * 比较两个对象，并记录变更的字段 - * - * @param current 当前数据 - * @param previous 上一次的数据 - * @param allowChangeFieldNames 允许变更的字段名 - * @param dictMap 字典数据 - * @return NutMap - */ @Override - public List compareChange(Sys_user_history current, Sys_user_history previous, Set allowChangeFieldNames, Map dictMap) { - List changeList = new ArrayList<>(); - NutMap currentMap = Lang.obj2nutmap(current); - NutMap previousMap = Lang.obj2nutmap(previous); + public List getChangeInfos(MemberChangeRecord record) { + View_user info = dao().fetch(View_user.class, Cnd.where("id", "=", record.getUserId())); - for (String fieldName : allowChangeFieldNames) { - extractChange(currentMap, previousMap, fieldName, dictMap, changeList); - } - return changeList; - } - - - /** - * 校验是否有变更 - * @param - */ - @Override - public List compareMemberChangeInfo(Sys_user_history history) { - List infos = history.getChangeInfos(); - if (ObjectUtil.isEmpty(infos)) { - throw new BaseException("获取变更记录失败"); - } - return infos; - } - - /** - * 校验是否有变更 - * @param record - */ - @Override - public List compareMemberChangeInfo(MemberApplyRecord record) { - if (ObjectUtil.isEmpty(record) || ObjectUtil.isEmpty(record.getLoginname())) { - throw new BaseException("未获取到变更记录"); - } - - NutMap previousMap = NutMap.NEW(); - - View_user user = dao().fetch(View_user.class, Cnd.where("loginname", "=", record.getLoginname())); - previousMap = Lang.obj2nutmap(user); - - //获取允许变更的字段 - List dictList = sysDictService.getSubListByCode("MEMBER_ALLOW_CHANGES_FIELD"); - Set allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet()); - Map dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName)); + NutMap map = getDictAllowChangeFields(); + Set allowChangeFieldNames = map.getAs("allowChangeFieldNames", Set.class); + Map dictMap = map.getAs("dictMap", Map.class); + // 新数据 + NutMap newMap = Lang.obj2nutmap(record); + // 原数据 + NutMap sourceMap = Lang.obj2nutmap(info); List changeList = new ArrayList<>(); - NutMap currentMap = Lang.obj2nutmap(record); - for (String fieldName : allowChangeFieldNames) { - extractChange(currentMap, previousMap, fieldName, dictMap, changeList); - } - if (Lang.isEmpty(changeList)) { - throw new BaseException("未获取到变更数据，请核对是否修改了数据"); + extractChange(newMap, sourceMap, fieldName, dictMap, changeList); } return changeList; } @Override - public List compareMemberChangeType(List changeList, MemberApplyRecord record) { - if (Lang.isEmpty(changeList)) { - return null; - } + public List compareChangeType(MemberChangeRecord record, View_user user) { List changeTypes = new ArrayList<>(); - // 有单位发生变化的记录数据 - long unitChangeCount = changeList.stream().filter(item -> item != null && "unitId".equals(item.get("fieldName"))).count(); - if (unitChangeCount > 0) { - // 有单位的变化，表明是单位变更 - changeTypes.add(MemberChangeType.UNIT_CHANGE.name()); - // 如果有非单位变更，表明是基本信息变更 - long nonUnitChangeCount = changeList.size() - unitChangeCount; - if (nonUnitChangeCount > 0) { - changeTypes.add(MemberChangeType.BASIC_CHANGE.name()); + changeTypes.add(MemberChangeType.BASIC_CHANGE.name()); + if (!ObjectUtil.equals(user.getUserState(), record.getUserState())) { + List list = Arrays.stream(MemberChangeType.values()) + .filter(v -> v.getChangeTypeName().equals(record.getUserState())).toList(); + if (Lang.isNotEmpty(list)) { + changeTypes.add(list.get(0).name()); } - } else { - // 没有单位的变化，表明是基本信息变更 - changeTypes.add(MemberChangeType.BASIC_CHANGE.name()); } - - // record中是否存在前端传递过来的变更状态，（入会/退会） - String changeType = record.getChangeType(); - if (StrUtil.isNotBlank(changeType)) { - changeTypes.add(changeType); + if (!ObjectUtil.equals(user.getMember() == 1, record.getMember())){ + if (record.getMember()) { + changeTypes.add(MemberChangeType.RESTORE.name()); + } else { + changeTypes.add(MemberChangeType.WITHDRAWAL.name()); + } + } + if (!ObjectUtil.equals(user.getUnitId(), record.getUnitId())) { + changeTypes.add(MemberChangeType.UNIT_CHANGE.name()); + } + if (!ObjectUtil.equals(user.getUnionId(), record.getUnionId())) { + changeTypes.add(MemberChangeType.UNION_CHANGE.name()); } - return changeTypes; } - /** - * 比较会员信息变更记录,并保存历史数据 - * - * @param record 传递的记录 - * @return - */ - @Aop(TransAop.READ_COMMITTED) + @Override - public void compareMemberChangeInfoAndUpdateUser(MemberApplyRecord record) { - List changeList = compareMemberChangeInfo(record); + public void compareChangeInfoAndUpdateMember(String recordId) { + MemberChangeRecord record = dao().fetch(MemberChangeRecord.class, recordId); + compareChangeInfoAndUpdateMember(record); + } - View_user user = dao().fetch(View_user.class, Cnd.where("loginname", "=", record.getLoginname())); + @Override + public void compareChangeInfoAndUpdateMember(MemberChangeRecord record) { + List changeList = getChangeInfos(record); + + // 如果有工会关系人员，这个user用来存储数据 + View_user user = dao().fetch(View_user.class, Cnd.where("id", "=", record.getUserId())); + // 获取会员信息,用于存储变更记录 + Sys_user info = dao().fetch(Sys_user.class, Cnd.where("id", "=", record.getUserId())); + String userId = info.getId(); Sys_user_history history = new Sys_user_history(); - // 存储变更记录 - if (ObjectUtil.isNotEmpty(changeList)) { - // 将当前的用户数据（user）记录成历史数据 - BeanUtil.copyProperties(user, history); - - if (Lang.isNotEmpty(record.getChangeTypes())) { - history.setChangeTypes(record.getChangeTypes()); - } else { - List changeTypes = this.compareMemberChangeType(changeList, record); - history.setChangeTypes(changeTypes); - } + if (Lang.isNotEmpty(changeList)) { + BeanUtil.copyProperties(info, history); } - if (ObjectUtil.isNotEmpty(history) && ObjectUtil.isNotEmpty(history.getLoginname())) { - Date nowDate = new Date(); + if (Lang.isNotEmpty(history)) { history.setRecordId(record.getId()); - history.setChangeTime(nowDate); - history.setUnionId(user.getUnionId()); - history.setUnionName(user.getUnionName()); - history.setChangeOrigin(StrUtil.isNotBlank(record.getChangeOrigin()) ? record.getChangeOrigin() : MemberChangeOrigin.SCHOOL_UNION.name()); - history.setChangeReason(record.getNotes()); - history.setRemark(record.getRemark()); - // 到此，表明审核通过，需要存储历史数据，并修改用户数据 - Chain chain = Chain.make("unitPath", null); + history.setChangeTime(DateUtil.date()); + history.setChangeTypes(record.getChangeTypes()); + history.setChangeOrigin(record.getChangeOrigin()); - changeList.forEach(v -> { - if ("unitId".equals(v.getString("fieldName"))) { - chain.add(v.getString("fieldName"), record.getUnitId()); - } else { - chain.add(v.getString("fieldName"), v.getString("newValue")); - } - }); - chain.add("member", record.getMember()); - chain.add("welfareMember", record.getWelfareMember()); - - Sys_role memberRole = dao().fetch(Sys_role.class, Cnd.where("`code`", "=", "MEMBER")); - dao().clear(Sys_user_role.class, Cnd.where("userId", "=", user.getId()).and("roleId","=", memberRole.getId())); + // 获取会员角色，加入或退出会员组别，写了之后用处不大，注释了，暂且保留，想优化就把下面注释打开，305行与304-348行取消注释 +// Sys_role role = sysRoleService.getByCode(RoleConstant.MEMBER); + // 加入会员 if (record.getMember()) { - Sys_user_role userRole = new Sys_user_role(); - userRole.setRoleId(memberRole.getId()); - userRole.setUserId(user.getId()); - dao().insert(userRole); +// int activityCount = dao().count(ActivityUserScope.class, Cnd.where("userId", "=", userId).and("groupId", "=", 1)); +// int memberCount = dao().count(Sys_user_role.class, Cnd.where("userId", "=", userId).and("roleId", "=", role.getId())); +// if (activityCount <= 0) { +// // 取消或加入会员组别 +// if (record.getIsJoinActivityMemberScope() != null && record.getIsJoinActivityMemberScope()) { +// ActivityUserScope scope = new ActivityUserScope(); +// scope.setUserId(userId); +// scope.setGroupId(1); +// scope.setGroupName("工会会员"); +// dao().insert(scope); +// } +// } +// if (memberCount <= 0) { +// Sys_user_role userRole = new Sys_user_role(); +// userRole.setUserId(userId); +// userRole.setRoleId(role.getId()); +// dao().insert(userRole); +// } +// // 杭医特有，其他学校请删除 +// record.setPreparedBy("会员"); +// } else { +// if (record.getIsExitActivityMemberScope() != null && record.getIsExitActivityMemberScope()) { +// dao().clear(ActivityUserScope.class, Cnd.where("userId", "=", userId).and("groupId", "=", 1)); +// } +// dao().clear(Sys_user_role.class, Cnd.where("userId", "=", userId).and("roleId", "=", Roles.MEMBER)); +// // 杭医特有，其他学校请删除 +// record.setPreparedBy("教职工"); +// } +// +// // 加入福利会员 是否加入福利项目 +// if (record.getWelfareMember() && record.getIsJoinWelfareProject() != null && record.getIsJoinWelfareProject()) { +// WelfareList welfareList = new WelfareList(); +// welfareList.setId(R.UU32()); +// welfareList.setProjectId(record.getWelfareProjectId()); +// welfareList.setUserId(userId); +// welfareList.setIsReceive(false); +// welfareList.setIsAutoSelect(false); +// welfareList.setUserState(record.getUserState()); +// welfareList.setPersonType(record.getPersonType()); +// welfareList.setWelfareUnitId(record.getUnitId()); +// dao().insert(welfareList); } - AtomicBoolean isRetire = new AtomicBoolean(false); - String changeInfos = changeList.stream().map(v -> { - if ("userState".equals(v.getString("fieldName")) && "退休".equals(v.getString("newValue"))) { - isRetire.set(true); - chain.add("retireDate", DateUtil.date()); - } - return "(变更字段：" + v.getString("name") + "，变更前：" + HtmlUtil.cleanHtmlTag(v.getString("value","")) + "，变更后：" + HtmlUtil.cleanHtmlTag(v.getString("newValue","")) + ")"; - }).collect(Collectors.joining("；")); - record.setChangeInfos(changeInfos); + // 到此，表明审核通过，需要存储历史数据，并修改用户数据 + BeanUtil.copyProperties(record, info); + info.setId(userId); + // 如果有单位变更，则需要记录单位关系 + if (record.getChangeTypes().contains(MemberChangeType.UNIT_CHANGE.name())) { + info.setUnitId(record.getUnitId()); + } + + // 如果工会发生变更了，就是工会关系变更，记录到特殊人员表中 + if (record.getChangeTypes().contains(MemberChangeType.UNION_CHANGE.name())) { + if (dao().count(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())) > 0) { + dao().clear(SpecialStaff.class, Cnd.where("userId", "=", record.getUserId())); + user = dao().fetch(View_user.class, Cnd.where("id", "=", record.getUserId())); + } + + if (!ObjectUtil.equals(user.getUnionId(), record.getUnionId())) { + Sys_union union = dao().fetch(Sys_union.class, Cnd.where("id", "=", record.getUnionId())); + // 记录工会关系变更的数据 + NutMap map = NutMap.NEW(); + map.put("field", "unionId"); + map.put("fieldName", "工会"); + map.put("sourceValue", record.getUnionName()); + map.put("newValue", union.getName()); + changeList.add(map); + + SpecialStaff staff = new SpecialStaff(); + staff.setUserId(userId); + staff.setPersonnelRelationUnitId(user.getUnitId()); + staff.setPersonnelRelationUnitName(user.getUnitName()); + staff.setUnionRelationUnionId(union.getId()); + staff.setUnionRelationUnionName(union.getName()); + staff.setIsManyUnit(false); + staff.setSpecialStaffType("HMC_RELATION"); + dao().insert(staff); + } + } + + // 如果有工会关系变更，也需要记录变更了什么工会 history.setChangeInfos(changeList); + String changeInfos = changeList.stream().map(v -> { + return v.getString("fieldName") + "：" + HtmlUtil.cleanHtmlTag(v.getString("sourceValue")) + "->" + HtmlUtil.cleanHtmlTag(v.getString("newValue")); + }).collect(Collectors.joining("；")); history.setChangeInfosStr(changeInfos); + dao().updateIgnoreNull(info); dao().insert(history); - dao().update(Sys_user.class, chain, Cnd.where("loginname", "=", record.getLoginname())); - } else { - throw new BaseException("未获取到变更数据，请核对是否修改了数据"); + sysUserService.deleteCache(info.getId()); } } - @Override - public List getLastTimeMemberChangeInfoByUserId(String userId, String verificationProjectId) { - MemberApplyRecord record = dao().fetch(MemberApplyRecord.class, Cnd.where("userId", "=", userId) - .and("verificationProjectId","=",verificationProjectId)); - if (ObjectUtil.isEmpty(record) || ObjectUtil.isEmpty(record.getLoginname())) { - throw new NullPointerException("数据获取失败"); + public List getAllChangeInfo(String userId) { + List resultMapList = new ArrayList<>(); + + Sql sql = Sqls.fetchString(Sqls.create("select loginname from sys_user where id = @id").setParam("id", userId).toString()); + dao().execute(sql); + String loginName = sql.getString(); + + MemberChangeRecord record = dao().fetch(MemberChangeRecord.class, Cnd.where("userId", "=", userId).desc("applyDateTime")); + + List historyList = dao().query(Sys_user_history.class, Cnd.where("loginname", "=", loginName) + .and("changeInfos", "is not", null).desc("changeTime")); + + List recordList = historyList.stream().map(Sys_user_history::getRecordId).toList(); + + if (Lang.isNotEmpty(record) && !recordList.contains(record.getId())) { + NutMap map = NutMap.NEW(); + List changeInfos = getChangeInfos(record.getId()); + map.put("changeInfos", changeInfos); + map.put("timestamp", DateUtil.format(record.getApplyDateTime(), "yyyy-MM-dd HH:mm:ss")); + map.put("changeOriginName", MemberChangeOrigin.valueOf(MemberChangeOrigin.class, record.getChangeOrigin()).changeOriginName); + resultMapList.add(map); } - View_user user = dao().fetch(View_user.class, Cnd.where("loginname", "=", record.getLoginname())); - - //获取允许变更的字段 - List dictList = sysDictService.getSubListByCode("MEMBER_ALLOW_CHANGES_FIELD"); - Set allowChangeFieldNames = dictList.stream().map(Sys_dict::getCode).collect(Collectors.toSet()); - Map dictMap = dictList.stream().collect(Collectors.toMap(Sys_dict::getCode, Sys_dict::getName)); - - List changeList = new ArrayList<>(); - - NutMap currentMap = Lang.obj2nutmap(record); - NutMap previousMap = Lang.obj2nutmap(user); - - for (String fieldName : allowChangeFieldNames) { - extractChange(currentMap, previousMap, fieldName, dictMap, changeList); + for (Sys_user_history history : historyList) { + NutMap map = NutMap.NEW(); + List changeInfos = history.getChangeInfos(); + map.put("changeInfos", changeInfos); + map.put("timestamp", DateUtil.format(history.getChangeTime(), "yyyy-MM-dd HH:mm:ss")); + map.put("changeOriginName", MemberChangeOrigin.valueOf(MemberChangeOrigin.class, history.getChangeOrigin()).changeOriginName); + resultMapList.add(map); } - return changeList; + return resultMapList; } - - /** * 比较两个对象，并记录变更的字段工具 * - * @param current 当前数据 - * @param previous 上一次的数据 - * @param dictMap 字典数据 + * @param newMap 新数据 + * @param sourceMap 原数据 + * @param fieldsMap 变更字段 * @param changeList 变更集合 */ @Override - public void extractChange(NutMap current, NutMap previous, String fieldName, Map dictMap, List changeList) { + public void extractChange(NutMap newMap, NutMap sourceMap, String fieldName, Map fieldsMap, List changeList) { try { - Object currentValue = this.booleanVerification(current.get(fieldName)); - Object previousValue = this.booleanVerification(previous.get(fieldName)); + Object currentValue = this.booleanVerification(newMap.get(fieldName)); + Object previousValue = this.booleanVerification(sourceMap.get(fieldName)); + + if ("unitId".equals(fieldName)) { + currentValue = (newMap.get(fieldName) == null ? this.booleanVerification(newMap.get("unitId")) : currentValue); + previousValue = (sourceMap.get(fieldName) == null ? this.booleanVerification(sourceMap.get("unitId")) : previousValue); + } if (!ObjectUtil.equals(currentValue, previousValue)) { - String name = dictMap.getOrDefault(fieldName, fieldName); - if ("unitId".equals(fieldName)) { - List unitList = dao().query(Sys_unit.class, Cnd.where("id", "in", List.of(previousValue, currentValue))); + String name = fieldsMap.getOrDefault(fieldName, fieldName); + if ("unitId".equals(fieldName) || "unitid".equals(fieldName)) { + List unitList = dao().query(Sys_unit.class, + Cnd.where("id", "in", List.of(previousValue, currentValue))); Object finalPreviousValue = previousValue; - previousValue = unitList.stream().filter(v->v.getId().equals(String.valueOf(finalPreviousValue))).findFirst().orElse(new Sys_unit()).getName(); + previousValue = unitList.stream().filter(v -> v.getId().equals(String.valueOf(finalPreviousValue))) + .findFirst().orElse(new Sys_unit()).getName(); Object finalCurrentValue = currentValue; - currentValue = unitList.stream().filter(v->v.getId().equals(String.valueOf(finalCurrentValue))).findFirst().orElse(new Sys_unit()).getName(); - } else if ("families".equals(fieldName)) { - return; + currentValue = unitList.stream().filter(v -> v.getId().equals(String.valueOf(finalCurrentValue))) + .findFirst().orElse(new Sys_unit()).getName(); } changeList.add(NutMap.NEW() - .setv("fieldName", fieldName) - .setv("name", name) - .setv("value", previousValue) + .setv("field", fieldName) + .setv("fieldName", name) + .setv("sourceValue", previousValue) .setv("newValue", currentValue)); } + } catch (Exception e) { log.error("Error while extracting and comparing changes for field: {}", fieldName, e); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberSchoolUnionManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberSchoolUnionManageServiceImpl.java index 2e6d5d7a..6d6a23c1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberSchoolUnionManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberSchoolUnionManageServiceImpl.java @@ -40,7 +40,7 @@ public class MemberSchoolUnionManageServiceImpl extends BaseServiceImpl changeTypes; private String changeOrigin; private Date applyDateTime; - private String verificationProjectId; + private String allocationUnionId; } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java new file mode 100644 index 00000000..a74b598a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentChartSummaryController.java @@ -0,0 +1,184 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @ClassName MemberPaymentChartSummaryController + * @Description 图表汇总 + * @Author zhf + * @Date 2025/3/11 下午3:20 + */ +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("会员缴费图表汇总") +@At("/platform/member/payment/chartSummary") +public class MemberPaymentChartSummaryController { + + + @Inject + private MemberPaymentService memberPaymentService; + + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/chartSummary/index.html") + @SaCheckPermission("member.payment.chartSummary") + public void index() { + } + + + @At + @ApiOperation("获取缴费项目图表") + @SaCheckPermission("member.payment.chartSummary") + public Result getPayProjectChart(@Param("startYear") Integer startYear, + @Param("endYear") Integer endYear) { + Sql sql = Sqls.create(""" + SELECT + mpp.projectName, + COUNT( mpi.id ) AS num + FROM + member_payment_project mpp + LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id + AND mpi.isPayment = 1 + WHERE + YEAR ( mpp.createTime ) BETWEEN @startYear + AND @endYear + GROUP BY + mpp.id + """).setParam("startYear", startYear).setParam("endYear", endYear); + return Result.success(memberPaymentService.listMap(sql)); + } + + @At + @ApiOperation("获取退款项目图表") + @SaCheckPermission("member.payment.chartSummary") + public Result getRefundProjectChart(@Param("startYear") Integer startYear, + @Param("endYear") Integer endYear) { + Sql sql = Sqls.create(""" + SELECT + mpp.projectName, + COUNT( pt.id ) AS num + FROM + member_payment_project mpp + LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id + LEFT JOIN payment_transaction pt ON pt.memberPaymentInfoId = mpi.id + AND pt.isRefund = 1 + WHERE + YEAR ( mpp.createTime ) BETWEEN @startYear + AND @endYear + GROUP BY + mpp.id + """).setParam("startYear", startYear).setParam("endYear", endYear); + return Result.success(memberPaymentService.listMap(sql)); + } + + @At + @ApiOperation("获取缴费金额图表") + @SaCheckPermission("member.payment.chartSummary") + public Result getPayMoneyChart(@Param("startYear") Integer startYear, + @Param("endYear") Integer endYear) { + Sql sql = Sqls.create(""" + SELECT + mpp.projectName, + SUM( pt.tradingAmount * 0.01 ) AS money + FROM + member_payment_project mpp + LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id + AND mpi.isPayment = 1 + LEFT JOIN payment_transaction pt ON pt.memberPaymentInfoId = mpi.id + AND pt.isRefund = 0 + AND pt.tradingState = 'PAY_SUCCESS' + WHERE + YEAR ( mpp.createTime ) BETWEEN @startYear + AND @endYear + GROUP BY + mpp.id + """).setParam("startYear", startYear).setParam("endYear", endYear); + return Result.success(memberPaymentService.listMap(sql)); + } + + + @At + @ApiOperation("获取缴费、退款数量") + @SaCheckPermission("member.payment.chartSummary") + public Result getNumData(@Param("startYear") Integer startYear, + @Param("endYear") Integer endYear) { + + Sql sql = Sqls.create(""" + SELECT + pt.tradingAmount * 0.01 AS money, + pt.isRefund + FROM + member_payment_project mpp + LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id + AND mpi.isPayment = 1 + LEFT JOIN payment_transaction pt ON pt.memberPaymentInfoId = mpi.id + AND pt.tradingState = 'PAY_SUCCESS' + WHERE + YEAR ( mpp.createTime ) BETWEEN @startYear + AND @endYear + """).setParam("startYear", startYear).setParam("endYear", endYear); + List map = memberPaymentService.listMap(sql); + + double payMoney = map.stream().filter(v -> !v.getBoolean("isRefund")).mapToDouble(v -> v.getDouble("money")).sum(); + double refundMoney = map.stream().filter(v -> v.getBoolean("isRefund")).mapToDouble(v -> v.getDouble("money")).sum(); + int refundSize = map.stream().filter(v -> v.getBoolean("isRefund")).collect(Collectors.toList()).size(); + int paySize = map.stream().filter(v -> !v.getBoolean("isRefund")).collect(Collectors.toList()).size(); + NutMap data = new NutMap(); + data.put("payMoney", payMoney); + data.put("refundMoney", refundMoney); + data.put("paySize", paySize); + data.put("refundSize", refundSize); + return Result.success(data); + } + + + @At + @ApiOperation("按分工会统计会员缴费金额") + @SaCheckPermission("member.payment.chartSummary") + public Result allUnionMoney(String paymentProjectId) { + Sql sql = Sqls.create(""" + SELECT + un.name AS unionname, + COALESCE ( SUM( subquery.money ), 0 ) AS money + FROM + sys_union un + LEFT JOIN ( + SELECT + pt.unionId, + SUM( pt.tradingAmount * 0.01 ) AS money + FROM + payment_transaction pt + INNER JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId + AND mpi.paymentProjectId = @paymentProjectId + WHERE + pt.tradingState = 'PAY_SUCCESS' + AND pt.isRefund = 0 + GROUP BY + pt.unionId + ) subquery ON subquery.unionId = un.id + GROUP BY + un.id, + un.unionname, + un.unioncode + ORDER BY + un.unioncode; + """).setParam("paymentProjectId", paymentProjectId); + return Result.success(memberPaymentService.listMap(sql)); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentConfigController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentConfigController.java new file mode 100644 index 00000000..e8919964 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentConfigController.java @@ -0,0 +1,103 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentConfig; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.List; + +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("会员缴费配置管理") +@At("/platform/member/payment/config") +public class MemberPaymentConfigController { + + @Inject + private MemberPaymentService memberPaymentService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/config.html") + @SaCheckPermission("member.payment.config") + public void index() {} + + + @At + @ApiOperation("缴费配置界面数据") + @SaCheckPermission("member.payment.config") + public Result pageData(PageForm pageForm, @Param("name") String name) { + Sql sql = Sqls.create("select * from member_payment_config $condition"); + Cnd cnd = Cnd.NEW(); + + if (Strings.isNotBlank(name)) { + cnd.and(Cnd.likeEX("name", name)); + } +// cnd.desc("project.`year`"); + cnd.desc("createdAt"); + sql.setCondition(cnd); + Pagination pagination = memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + @At + @ApiOperation("获取缴费配置") + @SaCheckPermission("member.payment.config") + public Result getPaymentConfig(){ + MemberPaymentConfig config = memberPaymentService.getConfig(); + return Result.success().addData(config); + } + + @At + @ApiOperation("获取缴费配置列表") + @SaCheckPermission("member.payment.config") + public Result getPaymentConfigList(){ + List paymentConfigList = memberPaymentService.getPaymentConfigList(); + return Result.success().addData(paymentConfigList); + } + + @At + @ApiOperation("删除缴费配置") + @SaCheckPermission("member.payment.config") + @SLog(tag = "会员缴费配置", msg = "删除缴费配置,${args[0]}") + public Result doRemove(String id){ + memberPaymentService.dao().clear(MemberPaymentConfig.class, Cnd.where("id", "=", id)); + return Result.success(); + } + + @At + @ApiOperation("打开/关闭缴费配置") + @SaCheckPermission("member.payment.config") + public Result openClosedConfig(String id){ + //位运算 取反 + memberPaymentService.dao().update(MemberPaymentConfig.class, + Chain.makeSpecial("isDisabled", "isDisabled ^ 1"), + Cnd.where("id", "=", id)); + return Result.success(); + } + + + @At + @ApiOperation("添加/修改缴费配置") + @SaCheckPermission("member.payment.config") + @SLog(tag = "会员缴费配置", msg = "添加/修改缴费配置，id:${args[0].id}") + public Result doAddOrModify(MemberPaymentConfig memberPaymentConfig){ + memberPaymentService.dao().insertOrUpdate(memberPaymentConfig); + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentMineController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentMineController.java new file mode 100644 index 00000000..cafd183c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentMineController.java @@ -0,0 +1,187 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.budwk.app.base.annotation.RepeatSubmit; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.payment.model.PaymentRefundRecord; +import com.budwk.app.base.payment.model.PaymentTransaction; +import com.budwk.app.base.payment.wxpay.service.WxPayCommonService; +import com.budwk.app.base.payment.wxpay.vo.WxPayNeedParamVo; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import com.ijpay.wxpay.model.v3.Amount; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; +import org.nutz.dao.FieldFilter; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.Daos; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @version 1.0 + * @Author zzr + * @name：MemberPaymentMineController + * @Date 2025/3/10 8:44 + * @注释 我的缴费列表 + */ +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("我的缴费列表") +@At("/platform/member/payment/mine") +public class MemberPaymentMineController { + + @Inject + private Dao dao; + @Inject + private WxPayCommonService wxPayCommonService; + @Inject + private MemberPaymentService memberPaymentService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/mine/index.html") + @SaCheckPermission("member.payment.mine") + public void index() { + } + + + @At + @ApiOperation("缴费配置界面数据") + @SaCheckPermission("member.payment.mine") + public Result pageData(PageForm pageForm, Integer year, Integer isPay) { + Sql sql = Sqls.create(""" + SELECT + mpp.`year`, + mpp.projectName, + mpp.startTime, + mpp.endTime, + mpi.id, + mpi.isPayment, + mpi.payPersonnel, + mpi.personType, + mpi.userState, + mpi.paymentMonth, + mpi.isRefund, + mpi.refundState, + mpc.paymentStartMonth, + mpc.paymentEndMonth, + mpc.payStandards + FROM + `member_payment_info` mpi + LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id + LEFT JOIN member_payment_config mpc ON mpc.id = mpp.configId + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("YEAR(mpp.createTime)", "=", year); + cnd.andEX("mpi.userId", "=", SecurityUtil.getUserId()); + cnd.and("mpp.endTime", ">=", DateUtil.today()); + cnd.andEX("mpp.isDisabled", "=", 0); + if (ObjectUtil.isNotNull(isPay)) { + if (isPay == 0) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("mpi.isPayment", "=", 0); + seg.or("mpi.isPayment", "is", null); + cnd.and(seg); + } else { + cnd.and("mpi.isPayment", "=", isPay); + } + } + sql.setCondition(cnd); + Pagination pagination = memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @RepeatSubmit + @ApiOperation("PC端唤起微信支付") + @SaCheckPermission("member.payment.mine") + @SLog(tag = "会员缴费", msg = "微信PC端订单支付，下单Id：${args[1]}，交易金额：${args[0]}") + public Result pcOrderPay(Integer paymentMoney, String paymentInfoId) { + WxPayNeedParamVo paramVo = new WxPayNeedParamVo(); + paramVo.setDescription(SecurityUtil.getUserUsername() + "会费缴纳支付"); + paramVo.setAttach(""); + paramVo.setMemberPaymentInfoId(paymentInfoId); + paramVo.setAmount(new Amount().setTotal(paymentMoney)); + return wxPayCommonService.nativePay(paramVo); + } + + + @At + @ApiOperation("获取是否已经缴费") + @SaCheckPermission("member.payment.mine") + public Result getIsPay(String paymentInfoId) { + int count = memberPaymentService.dao().count(MemberPaymentInfo.class, + Cnd.where("id", "=", paymentInfoId).and("isPayment", "=", 1)); + return Result.success().addData(count); + } + + + @At + @ApiOperation("获取缴费信息") + @SaCheckPermission("member.payment.mine") + public Result getPaymentInfoById(String id) { + Sql sql = Sqls.create(""" + SELECT + mpi.id, + mpi.loginname, + u.username, + u.unionname, + u.unitname, + mpp.projectName, + mpi.isPayment, + mpi.payPersonnel, + mpi.personType, + mpi.paymentMonth, + mpi.paymentMoney + FROM + `member_payment_info` mpi + LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id + LEFT JOIN `user` u ON u.loginname = mpi.loginname + WHERE + mpi.id = @id + """).setParam("id", id); + // 查出id的缴费信息，并且查出缴费记录 + sql.setCallback(Sqls.callback.map()); + dao.execute(sql); + NutMap result = (NutMap) sql.getResult(); + + // 订单信息 + FieldFilter transFieldFilter = FieldFilter.locked(PaymentTransaction.class, "resultJson"); + List transList = Daos.ext(dao, transFieldFilter).query(PaymentTransaction.class, Cnd.where("memberPaymentInfoId", "=", id).desc("createdAt")); + + if (Lang.isNotEmpty(transList)) { + result.put("transList", transList); + // 退款信息 + + List transIdList = transList.stream().map(PaymentTransaction::getId).collect(Collectors.toList()); + + FieldFilter refundFieldFilter = FieldFilter.locked(PaymentRefundRecord.class, "resultJson"); + List refundRecordList = Daos.ext(dao, refundFieldFilter).query(PaymentRefundRecord.class, + Cnd.where("paymentTransactionId", "in", transIdList).desc("createdAt")); + if (Lang.isNotEmpty(refundRecordList)) { + result.put("refundRecordList", refundRecordList); + } + } + return Result.success().addData(result); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentProjectController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentProjectController.java new file mode 100644 index 00000000..7b71b4df --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentProjectController.java @@ -0,0 +1,295 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_user; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentConfig; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentProject; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.impl.NutTxDao; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("会员缴费项目管理") +@At("/platform/member/payment/project") +public class MemberPaymentProjectController { + + @Inject + private MemberPaymentService memberPaymentService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/project.html") + @SaCheckPermission("member.payment.project") + public void index() { + } + + + @At + @ApiOperation("缴费项目界面数据") + @SaCheckPermission("member.payment.project") + public Result pageData(PageForm pageForm, + @Param("year") String year, + @Param("projectName") String projectName) { + Sql sql = Sqls.create("select project.*,IF((SELECT count(1) FROM member_payment_info WHERE paymentProjectId = project.id)>0,TRUE,FALSE) created from member_payment_project project $condition"); + Cnd cnd = Cnd.NEW(); + cnd.andEX("project.`year`", "=", year); + if (Strings.isNotBlank(projectName)) { + cnd.and(Cnd.likeEX("project.projectName", projectName)); + } +// cnd.desc("project.`year`"); + cnd.desc("project.createTime"); + sql.setCondition(cnd); + Pagination pagination = memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + /** + * 是否开启 + * + * @param id 项目Id + * @return + */ + @At + @ApiOperation("开启/禁用缴费项目") + @SaCheckPermission("member.payment.project") + public Result openClosedProject(String id) { + //位运算 取反 + memberPaymentService.dao().update(MemberPaymentProject.class, + Chain.makeSpecial("isDisabled", "isDisabled ^ 1"), + Cnd.where("id", "=", id)); + return Result.success(); + } + + + /** + * 添加或修改缴费项目 + * + * @param paymentProject + * @return + */ + @At + @ApiOperation("添加/修改缴费项目") + @SaCheckPermission("member.payment.project") + @SLog(tag = "会员缴费项目", msg = "添加/修改缴费项目") + public Result doSave(MemberPaymentProject paymentProject) { + memberPaymentService.insertOrUpdate(paymentProject); + return Result.success(); + } + + + /** + * 设置缴费人员 + * + * @param id 缴费项目Id + * @param isRenew 是否更行缴费人员 + * @return + */ + @At + @ApiOperation("设置缴费人员") + @SaCheckPermission("member.payment.project") + @SLog(tag = "会员缴费项目", msg = "设置缴费人员") + public Result doSetPayment(String id, Boolean isRenew) { + //如果不是更新缴费人员，就删除该项目下的所有待缴费信息，再重新设置 + if (!isRenew) { + memberPaymentService.clear(Cnd.where("paymentProjectId", "=", id)); + } + + //获取缴费项目 + MemberPaymentProject project = memberPaymentService.dao().fetch(MemberPaymentProject.class, id); + //获取缴费配置 + MemberPaymentConfig config = memberPaymentService.getConfigById(project.getConfigId()); + List payStandards = config.getPayStandards(); + //缴费人员类型 + List personTypeList = payStandards.stream().map(MemberPaymentConfig.PayStandards::getPersonType).collect(Collectors.toList()); + + //获取所有有入会时间的会员 + List memberList = memberPaymentService.dao().query(Sys_user.class, Cnd.where("personType", "in", personTypeList)); + //获取该项目下的代缴人员 + List paymentUserIdList = memberPaymentService.query(Cnd.where("paymentProjectId", "=", id)).stream().map(MemberPaymentInfo::getUserId).collect(Collectors.toList()); + //过滤出需要新增到记录表中的人员 + List needInsertUserIds = memberList.stream().filter(v -> !paymentUserIdList.contains(v.getId())).collect(Collectors.toList()); + + + //该缴费配置的缴费月份是几月到几月，转为数组 + String[] strings = {config.getPaymentStartMonth(),config.getPaymentEndMonth()}; + DateTime beginDate = DateUtil.parse(strings[0] + "-01"); + //获取月份的最后一天 + DateTime endDate = DateUtil.endOfMonth(DateUtil.parse(strings[1] + "-01")); + + List memberPaymentInfos = new ArrayList<>(); + needInsertUserIds.forEach(v -> { + MemberPaymentInfo paymentInfo = new MemberPaymentInfo(); + paymentInfo.setPersonType(v.getPersonType()); + paymentInfo.setUserState(v.getUserState()); + long differMonth = 0; + //如果是新入职教工，计算需要缴纳的月数 + if (v.getMemberTime() == null) { + differMonth = DateUtil.betweenMonth(beginDate, endDate, false)+1; + paymentInfo.setPaymentMonth(String.valueOf(differMonth)); + paymentInfo.setPayPersonnel("普通会员"); + } else if (v.getMemberTime().after(beginDate) && v.getMemberTime().before(endDate)){ + differMonth = DateUtil.betweenMonth(v.getMemberTime(), endDate, false)+1; + paymentInfo.setPaymentMonth(String.valueOf(differMonth)); + paymentInfo.setPayPersonnel("新进会员"); + //getPayment(v, payStandards, paymentInfo, differMonth,"新进会员"); + + }else if(v.getRetireDate()!=null&&v.getRetireDate().after(beginDate)&&v.getRetireDate().before(endDate)){ + //如果是退休会员 + differMonth = DateUtil.betweenMonth(beginDate, v.getRetireDate(), false)+1; + paymentInfo.setPaymentMonth(String.valueOf(differMonth)); + paymentInfo.setPayPersonnel("退休会员"); + //getPayment(v, payStandards, paymentInfo, differMonth,"退休会员"); + }else { + //如果是普通会员 + differMonth = DateUtil.betweenMonth(beginDate, endDate, false)+1; + paymentInfo.setPaymentMonth(String.valueOf(differMonth)); + paymentInfo.setPayPersonnel("普通会员"); + //getPayment(v, payStandards, paymentInfo, differMonth,"普通会员"); + } + paymentInfo.setUserId(v.getId()); + paymentInfo.setLoginname(v.getLoginname()); + paymentInfo.setPaymentProjectId(id); + paymentInfo.setPayment(false); + memberPaymentInfos.add(paymentInfo); + }); + + if (memberPaymentInfos.size() < 500) { + memberPaymentService.insert(memberPaymentInfos); + } else { + List> splitList = CollectionUtil.split(memberPaymentInfos, 500); + NutTxDao nutTxDao = new NutTxDao(memberPaymentService.dao()).setDebug(true); + nutTxDao.beginRC(); + ExecutorService executorService = Executors.newWorkStealingPool(); + List> taskList = new ArrayList<>(); + for (List everyList : splitList) { + taskList.add(() -> nutTxDao.insert(everyList).size()); + } + List> futureList = null; + AtomicInteger atomicInteger = new AtomicInteger(); + try { + futureList = executorService.invokeAll(taskList); + for (Future future : futureList) { + atomicInteger.getAndAdd((Integer) future.get()); + } + if (atomicInteger.get() != memberPaymentInfos.size()) { + throw new RuntimeException("插入数据与期望数据条数不符"); + } + nutTxDao.commit(); + } catch (Exception e) { + nutTxDao.rollback(); + throw new RuntimeException(e); + } finally { + executorService.shutdown(); + } + } + return Result.success(); + } + + private static void getPayment(Sys_user v, List payStandards, MemberPaymentInfo paymentInfo, long differMonth,String payPersonnel) { + List list = payStandards.stream().filter(v1 -> v1.getPersonType().equals(v.getPersonType()) && payPersonnel.equals(v1.getPayPersonnel())).collect(Collectors.toList()); + MemberPaymentConfig.PayStandards standards = null; + if (list!=null&&list.size()>0){ + standards = list.get(0); + } + if ("在编".equals(v.getPersonType())&&standards!=null){ + AtomicReference value= new AtomicReference<>(0); + standards.getPayModeValueList().forEach(v1->{ + value.set(value.get()+v1.getInt("value")); + }); + paymentInfo.setPaymentMoney(String.valueOf(value.get()*0.05* differMonth)); + } + if ("非编".equals(v.getPersonType())&&standards!=null){ + paymentInfo.setPaymentMoney(String.valueOf(Integer.valueOf(standards.getPayModeValue())* differMonth)); + } + } + + + /** + * 删除 + * + * @param id 项目Id + * @return + */ + @At + @ApiOperation("删除缴费项目") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.payment.project") + @SLog(tag = "会员缴费项目", msg = "删除缴费项目: ${args[0]}") + public Result doRemove(String id) { + int paymentCount = memberPaymentService.count(Cnd.where("paymentProjectId", "=", id).and("isPayment", "=", 1)); + if (paymentCount > 0) { + return Result.error().addMsg("该项目已有人完成缴费，请将缴费人员设置为未缴后再进行删除！"); + } + memberPaymentService.dao().clear(MemberPaymentProject.class, Cnd.where("id", "=", id)); + memberPaymentService.clear(Cnd.where("paymentProjectId", "=", id)); + return Result.success(); + } + + + /** + * 获取全部缴费项目 + * + * @param year + * @return + */ + @At + @ApiOperation("获取全部缴费项目") + @SaCheckPermission(value = {"member.payment.project", "member.payment.summary"}, mode = SaMode.OR) + public Result getAllProject(String year) { + Cnd cnd = Cnd.NEW(); + cnd.and("isDisabled", "=", 0); + if (Strings.isNotBlank(year)) { + cnd.and("`year`", "=", year); + } + cnd.desc("createTime"); + cnd.desc("year"); + return Result.success().addData(memberPaymentService.dao().query(MemberPaymentProject.class, cnd)); + } + + + @At("/findOne") + @ApiOperation("获取缴费项目信息") + @SaCheckPermission(value = {"member.payment.project", "member.payment.summary"}, mode = SaMode.OR) + public Result findOne(String id) { + MemberPaymentProject oneProject = memberPaymentService.findOneProject(id); + return Result.success().addData(oneProject); + } + + + +} + diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentRefundController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentRefundController.java new file mode 100644 index 00000000..a406f76c --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentRefundController.java @@ -0,0 +1,115 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import com.budwk.app.base.annotation.RepeatSubmit; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.payment.enums.TradingStateEnum; +import com.budwk.app.base.payment.model.PaymentTransaction; +import com.budwk.app.base.payment.wxpay.service.WxPayCommonService; +import com.budwk.app.base.result.Result; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +/** + * @ClassName MemberPaymentRefundController + * @Description 退款 + * @Author zhf + * @Date 2025/3/11 上午8:51 + */ +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("会员缴费退款") +@At("/platform/member/payment/refund") +public class MemberPaymentRefundController { + + @Inject + private WxPayCommonService wxPayCommonService; + @Inject + private MemberPaymentService memberPaymentService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/refund/index.html") + @SaCheckPermission("member.payment.refund") + public void index() { + } + + @At + @ApiOperation("退款数据列表") + @SaCheckPermission("member.payment.refund") + public Result pageData(PageForm pageForm, String paymentProjectId, String transactionId, Integer isRefund) { + Sql sql = Sqls.create(""" + SELECT + mpp.`year`, + mpp.projectName, + mpp.startTime, + mpp.endTime, + mpi.isPayment, + mpi.payPersonnel, + mpi.personType, + mpi.paymentMonth, + mpi.paymentTime, + pt.id, + pt.outTradeNo, + pt.transactionId, + pt.userName, + pt.loginName, + pt.unitName, + pt.unionName, + pt.tradingAmount, + pt.isRefund, + prr.createdAt AS refundTime + FROM + payment_transaction pt + LEFT JOIN `member_payment_info` mpi ON pt.memberPaymentInfoId = mpi.id + LEFT JOIN `payment_refund_record` prr ON pt.id = prr.paymentTransactionId + LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id + $condition + """); + Cnd cnd = Cnd.NEW(); + cnd.andEX("mpi.paymentProjectId", "=", paymentProjectId); + cnd.andEX("pt.tradingState", "=", TradingStateEnum.PAY_SUCCESS); + cnd.and(Cnd.likeEX("pt.transactionId", transactionId)); + if (isRefund != 3) { + cnd.andEX("pt.isRefund", "=", isRefund); + } + if (ObjectUtil.isNotEmpty(pageForm.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("pt.userName", pageForm.getSearchKeyword()); + group.orLike("pt.loginName", pageForm.getSearchKeyword()); + cnd.and(group); + } + cnd.groupBy("pt.id"); + cnd.desc("mpi.paymentTime"); + sql.setCondition(cnd); + Pagination pagination = memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @RepeatSubmit + @ApiOperation("缴费退款") + @SaCheckPermission("member.payment.refund") + @SLog(tag = "会员缴费退款", msg = "会员缴费退款: ${args[0]}") + public Result doRefund(@Param("id") String id) { + PaymentTransaction transaction = memberPaymentService.dao().fetch(PaymentTransaction.class, id); + Result refund = wxPayCommonService.refund(transaction.getTransactionId(), transaction.getOutTradeNo()); + return Result.success().addData(refund); + } + + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java new file mode 100644 index 00000000..6181a141 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentSummaryController.java @@ -0,0 +1,287 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.CommonDownloadUtil; +import com.budwk.app.sys.models.Sys_union; +import com.budwk.app.sys.services.SysUserService; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import com.budwk.app.zhgh.staffmanage.memberCost.template.MemberPaymentTemp; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +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.AdaptBy; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; +import org.nutz.mvc.upload.TempFile; +import org.nutz.mvc.upload.UploadAdaptor; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedOutputStream; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.util.*; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("会员缴费汇总") +@At("/platform/member/payment/summary") +public class MemberPaymentSummaryController { + + @Inject + private MemberPaymentService memberPaymentService; + + @Inject + private SysUserService sysUserService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/summary.html") + @SaCheckPermission("member.payment.summary") + public void index() { + } + + + @At + @ApiOperation("会员缴费汇总数据") + @SaCheckPermission("member.payment.summary") + public Result pageData(PageForm pageForm, + @Param("unionId") String unionId, + @Param("unitId") String unitId, + @Param("unionGroupId") String unionGroupId, + @Param("threeUnitId") String threeUnitId, + @Param("personType") String personType, + @Param("userState") String userState, + @Param("paymentProjectId") String paymentProjectId, + @Param("year") String year, + @Param("isPay") String isPay, + @Param("schoolTimeStart") String schoolTimeStart, + @Param("schoolTimeEnd") String schoolTimeEnd, + @Param("retireDateStart") String retireDateStart, + @Param("retireDateEnd") String retireDateEnd, + @Param("search") String search) { + Sql sql = memberPaymentService.getSummarySql(pageForm.getPageOrderName(), pageForm.getPageOrderBy(), pageForm.getSearchName(), + pageForm.getSearchKeyword(), unionId, unitId, threeUnitId, unionGroupId, + personType, userState, paymentProjectId, year, isPay, schoolTimeStart, schoolTimeEnd, + retireDateStart, retireDateEnd, search); + Pagination pagination = memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + + @At + @ApiOperation("修改缴费信息") + @SLog(tag = "缴费汇总", msg = "修改缴费信息") + @SaCheckPermission("member.payment.summary") + public Result modify(@Param("ids") String[] ids, String paymentMoney, boolean isPay, String remark) { + List idList = Arrays.asList(ids); + if (Lang.isNotEmpty(idList)) { + if (!isPay) { + //未缴费设为已缴费 + memberPaymentService.update(Chain.make("paymentMoney", paymentMoney) + .add("remark", remark).add("isPayment", 1) + .add("paymentTime", new Date()), + Cnd.where("id", "in", idList)); + } else { + //已缴费设为未缴费 + memberPaymentService.update(Chain.make("paymentMoney", null) + .add("isPayment", 0).add("paymentTime", null), + Cnd.where("id", "in", idList)); + } + } + return Result.success(); + } + + @At + @ApiOperation("删除缴费信息") + @SaCheckPermission("member.payment.summary") + @SLog(tag = "缴费汇总", msg = "根据缴费Id删除缴费信息") + public Result doRemoveById(String id) { + memberPaymentService.delete(id); + return Result.success(); + } + + @At + @Ok("void") + @ApiOperation("下载导入模版") + @SaCheckPermission("member.payment.summary") + public void downloadImportTemp(HttpServletResponse response) { + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, MemberPaymentTemp.class, new ArrayList<>()); + CommonDownloadUtil.download("会员缴费导入模版.xlsx", workbook, response); + } + + + @At + @ApiOperation("导入缴费信息") + @SaCheckPermission("member.payment.summary") + @SLog(tag = "导入缴费信息", msg = "导入缴费信息") + @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"}) + public Result doImport(TempFile file, String projectId) { + try { + List memberPaymentTempList = ExcelImportUtil.importExcel(file.getFile(), MemberPaymentTemp.class, new ImportParams()); + + List paymentUserList = memberPaymentService.query(Cnd.where("paymentProjectId", "=", projectId)); + Map infoMap = paymentUserList.stream().collect(Collectors.toMap(MemberPaymentInfo::getLoginname, v -> v)); + List errorInfos = new ArrayList<>(); + List needInsertList = new ArrayList<>(); + + //缴费比例 + for (MemberPaymentTemp v : memberPaymentTempList) { + if (infoMap.containsKey(v.getLoginname().trim())) { + MemberPaymentInfo memberPaymentInfo = infoMap.get(v.getLoginname().trim()); + + // 如果系统里边没有这个工号，返回错误信息，然后跳过 + if (Lang.isEmpty(memberPaymentInfo)) { + v.setResult("请检查该工号是否正确！"); + errorInfos.add(v); + continue; + } + + memberPaymentInfo.setPayment(v.getIsPay()); + + if (Strings.isNotBlank(v.getPaymentBase())) { + String paymentBase = v.getPaymentBase(); + + BigDecimal value = new BigDecimal(paymentBase); + BigDecimal multipliedValue = value.multiply(new BigDecimal(100)); + // 转换为整数类型 + int result = multipliedValue.intValueExact(); + memberPaymentInfo.setPaymentMoney(String.valueOf(result)); + memberPaymentInfo.setPaymentTime(v.getIsPay() ? DateUtil.date() : null); + memberPaymentInfo.setRemark(v.getRemark()); + memberPaymentInfo.setPaymentMethod("导入"); + needInsertList.add(memberPaymentInfo); + } else { + v.setResult("请填写该教职工的缴费数据！"); + errorInfos.add(v); + } + } else { + v.setResult("该教工可能不在此次缴费项目之中，请重新设置缴费人员或检查人员是否正确！"); + errorInfos.add(v); + } + } + + int i = 0; + if (Lang.isNotEmpty(needInsertList)) { + i = memberPaymentService.updateIgnoreNull(needInsertList); + } + + if (Lang.isNotEmpty(errorInfos)) { + NutMap nutMap = NutMap.NEW(); + nutMap.setv("totalCount", memberPaymentTempList.size()); + nutMap.setv("successCount", i); + nutMap.setv("errorCount", errorInfos.size()); + nutMap.setv("errorList", errorInfos.stream().map(v -> { + return NutMap.NEW().addv("工号", v.getLoginname()).addv("姓名", v.getUsername()).addv("错误原因", v.getResult()); + }).collect(Collectors.toList())); + return Result.success(nutMap); + } + return Result.success(); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(); + } + } + + + @At + @Ok("void") + @ApiOperation("导出缴费信息") + @SaCheckPermission("member.payment.summary") + public void doExport(@Param("searchName") String searchName, + @Param("searchKeyword") String searchKeyword, + @Param("unionId") String unionId, + @Param("unitId") String unitId, + @Param("unionGroupId") String unionGroupId, + @Param("threeUnitId") String threeUnitId, + @Param("personType") String personType, + @Param("userState") String userState, + @Param("paymentProjectId") String paymentProjectId, + @Param("year") String year, + @Param("isPay") String isPay, + @Param("schoolTimeStart") String schoolTimeStart, + @Param("schoolTimeEnd") String schoolTimeEnd, + @Param("retireDateStart") String retireDateStart, + @Param("retireDateEnd") String retireDateEnd, + boolean isZip, HttpServletResponse response) { + Sql sql = memberPaymentService.getSummarySql(null, null, searchName, searchKeyword, unionId, unitId, threeUnitId, + unionGroupId, personType, userState, paymentProjectId, year, isPay, schoolTimeStart, schoolTimeEnd, + retireDateStart, retireDateEnd, ""); + + List list = memberPaymentService.listMap(sql); + NutMap nutMap = list.stream().findFirst().orElse(null); + + List unionIdList = memberPaymentService.dao().query(Sys_union.class, Cnd.NEW()); + try { + assert nutMap != null; + if (isZip) { + response.setContentType("application/octet-stream"); + response.setHeader("content-disposition", "attachment;filename=" + + URLEncoder.encode((Lang.isNotEmpty(nutMap) ? nutMap.getString("projectName") : "") + "缴费详情.zip", "UTF-8")); + ZipOutputStream zipOutputStream = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream())); + for (Sys_union union : unionIdList) { + String fileName = union.getUnionCode() + union.getName().replaceAll("/", "、") + "缴费记录表.xlsx"; + zipOutputStream.putNextEntry(new ZipEntry(fileName)); + List unionUserList = list.stream().filter(v -> Strings.isNotBlank(v.getString("unionid")) && v.getString("unionid").equals(union.getId())).collect(Collectors.toList()); + Workbook workbook = memberPaymentService.exportOrZip(unionUserList, response.getOutputStream()); + workbook.write(zipOutputStream); + zipOutputStream.closeEntry(); + response.flushBuffer(); + } + zipOutputStream.flush(); + zipOutputStream.close(); + } else { + String fileName = (Lang.isNotEmpty(nutMap) ? nutMap.getString("projectName") : "") + "缴费详情表.xlsx"; + Workbook workbook = memberPaymentService.exportOrZip(list, response.getOutputStream()); + CommonDownloadUtil.download(fileName, workbook, response); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + + @At + @ApiOperation("发送缴费信息") + @SaCheckPermission("member.payment.summary") + public Result sendPaymentMsg(@Param("id") String id) { + if (Strings.isNotBlank(id)) { + List paymentInfos = memberPaymentService.query(Cnd.where("isPayment", "=", 0)); +// msgApi.sendMsg(); + } else { + MemberPaymentInfo paymentInfo = memberPaymentService.fetch(id); +// msgApi.sendMsg(); + } + return Result.success(); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentUserController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentUserController.java new file mode 100644 index 00000000..cd50d5a4 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/controller/MemberPaymentUserController.java @@ -0,0 +1,85 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +/** + * 个人缴费管理 + * @author hpf + */ +@Slf4j +@IocBean +@Ok("json:full") +@ApiOperation("个人缴费管理") +@At("/platform/member/payment/user") +public class MemberPaymentUserController { + + @Inject + private MemberPaymentService memberPaymentService; + + @At("") + @Ok("beetl:/platform/zhgh/staffmanage/membercost/user.html") + @SaCheckPermission("member.payment.user") + public void index() { + } + + @At + @ApiOperation("分页查询") + @SaCheckPermission("member.payment.user") + public Result pageData(PageForm pageForm, @Param("year") String year, @Param("projectName") String projectName){ + Sql sql = Sqls.create(""" + SELECT + mpi.*, + mpp.`year`, + mpp.projectName, + mpp.startTime, + mpp.endTime, + mpp.configId, + mpc.payStandards, + mpc.paymentStartMonth, + mpc.paymentEndMonth + FROM + member_payment_info mpi + LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id + LEFT JOIN member_payment_config mpc ON mpc.id = mpp.configId + $condition + """); + Cnd cnd = Cnd.NEW(); + + cnd.andEX("mpp.isDisabled", "=", false); + cnd.andEX("mpp.year", "=", year); + cnd.and("mpi.userId", "=", SecurityUtil.getUserId()); + if (Strings.isNotBlank(projectName)) { + cnd.and(Cnd.likeEX("mpp.projectName", projectName)); + } + cnd.desc("mpp.createTime"); + sql.setCondition(cnd); + Pagination pagination = memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success().addData(pagination); + } + + @At + @ApiOperation("保存或修改") + @SaCheckPermission("member.payment.user") + public Result doSave(MemberPaymentInfo memberPaymentInfo) { + memberPaymentService.insertOrUpdate(memberPaymentInfo); + return null; + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/h5controller/MobileMemberCostListController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/h5controller/MobileMemberCostListController.java new file mode 100644 index 00000000..bf55bd61 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/h5controller/MobileMemberCostListController.java @@ -0,0 +1,97 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.h5controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.payment.wxpay.service.WxPayCommonService; +import com.budwk.app.base.payment.wxpay.vo.WxPayNeedParamVo; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import com.ijpay.wxpay.model.v3.Amount; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +/** + * @ClassName MobileMemberCostListController + * @Description TODO + * @Author zhf + * @Date 2024/1/26 15:37 + */ +@Slf4j +@IocBean +@Ok("json:full") +@At("/mobile/memberCost/list") +public class MobileMemberCostListController { + + @Inject + private MemberPaymentService memberPaymentService; + @Inject + private WxPayCommonService wxPayCommonService; + + @At("") + @SaCheckPermission("member.payment.user") + @Ok("beetl:/mobile/memberCost/memberCostList.html") + public void index() { + } + + @At("/paySuccess") + @SaCheckPermission("member.payment.user") + @Ok("beetl:/mobile/memberCost/paySuccess.html") + public void paySuccess() { + } + + @At("/summary") + @SaCheckPermission("member.payment.user") + @Ok("beetl:/mobile/memberCost/summary.html") + public void summary() { + } + + + @At + @ApiOperation("获取缴费列表") + @SaCheckPermission("member.payment.user") + public Result pageData(Integer memberActive) { + Sql sql = Sqls.create(""" + SELECT + mpi.*, + mpp.projectName + FROM + member_payment_info mpi + LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id + WHERE + mpi.userId = @userId + AND mpp.isDisabled =0 + and mpi.isPayment =@isPayment + """).setParam("userId", SecurityUtil.getUserId()).setParam("isPayment", memberActive); + + return Result.success().addData(memberPaymentService.listMap(sql)); + } + + @At + @ApiOperation("获取支付信息") + @SaCheckPermission("member.payment.user") + public Result getPayInfo(String id) { + MemberPaymentInfo info = memberPaymentService.fetch(id); + return Result.success().addData(info); + } + + @At + @ApiOperation("唤起微信支付") + @SaCheckPermission("member.payment.user") + @SLog(tag = "会员管理", msg = "唤起微信支付，支付金额：${args[0]}；唯一Id：${args[1]}") + public Result pullWeChatPay(Integer money, String busId) { + WxPayNeedParamVo wxPayNeedParamVo = new WxPayNeedParamVo(); + wxPayNeedParamVo.setDescription("会费缴纳"); + wxPayNeedParamVo.setMemberPaymentInfoId(busId); + wxPayNeedParamVo.setAmount(new Amount().setTotal(money)); + return wxPayCommonService.jsApiPay(wxPayNeedParamVo); + } + +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentConfig.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentConfig.java new file mode 100644 index 00000000..59e3a01f --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentConfig.java @@ -0,0 +1,73 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; +import org.nutz.lang.util.NutMap; + +import java.io.Serializable; +import java.util.List; + +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class MemberPaymentConfig extends BaseModel { + + @Column + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("缴费配置名称") + @ColDefine(type = ColType.VARCHAR,width = 50) + private String name; + + @Column + @Comment("缴费标准") + @ColDefine(type = ColType.MYSQL_JSON) + private List payStandards; + + @Column + @Comment("未缴费退会时长") + @ColDefine(type = ColType.VARCHAR,width = 10) + private String unPaidExitDuration; + + @Column + @Comment("退会模式（1,。自动退会；2.人工退会）") + @ColDefine(type = ColType.VARCHAR,width = 10) + private String exitMode; + + @Column + @Comment("缴费时长（多久缴费一次）") + @ColDefine(type = ColType.VARCHAR,width = 10) + private String paidDuration; + + @Column + @Comment("是否开启") + @ColDefine(type = ColType.BOOLEAN) + private boolean isDisabled; + + @Column + @Comment("开始缴费月份") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String paymentStartMonth; + + @Column + @Comment("结束缴费月份") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String paymentEndMonth; + + @Data + public static class PayStandards implements Serializable { + private String payPersonnel; + private String payMode; + private String personType; + private String payModeValue; + private List payModeValueList; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java new file mode 100644 index 00000000..d136bdba --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentInfo.java @@ -0,0 +1,118 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; + +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class MemberPaymentInfo extends BaseModel { + + @Column + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("用户id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String userId; + + @Column + @Comment("工号") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String loginname; + + @Column + @Comment("缴费项目id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String paymentProjectId; + + @Column + @Comment("工资") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String wages; + + @Column + @Comment("是否缴费") + @ColDefine(type = ColType.BOOLEAN) + private boolean isPayment; + + @Column + @Comment("缴费基数1") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String paymentBaseOne; + + @Column + @Comment("缴费基数2") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String paymentBaseTwo; + + @Column + @Comment("缴费金额") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String paymentMoney; + + @Column + @Comment("缴费日期") + @ColDefine(type = ColType.DATETIME) + private Date paymentTime; + + @Column + @Comment("备注") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String remark; + + @Column + @Comment("支付记录Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String payId; + + @Column + @Comment("支付宝记录Id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String tradeNo; + + @Column + @Comment("缴费方式") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String paymentMethod; + + + @Column + @Comment("缴费月份") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String paymentMonth; + + @Column + @Comment("人员类型") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String personType; + + @Column + @Comment("在职状态") + @ColDefine(type = ColType.VARCHAR, width = 20) + private String userState; + + @Column + @Comment("会员类型") + @ColDefine(type = ColType.VARCHAR, width = 10) + private String payPersonnel; + + @Column + @Comment("是否退款") + @ColDefine(type = ColType.BOOLEAN) + private Boolean isRefund; + + @Column + @Comment("退款状态") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String refundState; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentProject.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentProject.java new file mode 100644 index 00000000..2d629cd7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/model/MemberPaymentProject.java @@ -0,0 +1,68 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.model; + +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.*; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.Date; + +@Data +@Table +@EqualsAndHashCode(callSuper = true) +public class MemberPaymentProject extends BaseModel { + + @Column + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("年度") + @ColDefine(type = ColType.VARCHAR, width = 4) + private String year; + + @Column + @Comment("项目名称") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String projectName; + + @Column + @Comment("是否开启") + @ColDefine(type = ColType.BOOLEAN) + private boolean isDisabled; + + @Column + @Comment("创建时间") + @ColDefine(type = ColType.DATETIME) + private Date createTime; + + + @Column + @Comment("开始缴费月份") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String paymentStartMonth; + + @Column + @Comment("结束缴费月份") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String paymentEndMonth; + + @Column + @Comment("开始缴费时间") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String startTime; + + @Column + @Comment("结束缴费时间") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String endTime; + + @Column + @Comment("缴费配置id") + @ColDefine(type = ColType.VARCHAR,width = 32) + private String configId; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/MemberPaymentService.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/MemberPaymentService.java new file mode 100644 index 00000000..08e1b963 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/MemberPaymentService.java @@ -0,0 +1,76 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.service; + +import com.budwk.app.base.service.BaseService; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentConfig; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentProject; +import org.apache.poi.ss.usermodel.Workbook; +import org.nutz.dao.sql.Sql; +import org.nutz.lang.util.NutMap; + +import java.io.OutputStream; +import java.util.List; + +public interface MemberPaymentService extends BaseService { + + /** + * 根据id查询缴费项目 + * @param id + * @return + */ + MemberPaymentProject findOneProject(String id); + + /** + * 导出缴费信息的公共方法 + * @return + */ + Workbook exportOrZip(List list, OutputStream outputStream)throws Exception; + + /** + * 获取缴费配置信息 + * @return + */ + MemberPaymentConfig getConfig(); + + /** + * 获取缴费配置列表 + * @return + */ + List getPaymentConfigList(); + + /** + * 根据id获取缴费配置信息 + * @param configId + * @return + */ + MemberPaymentConfig getConfigById(String configId); + + /** + * 会员缴费汇总数据公共sql + * + * @param pageOrderName + * @param pageOrderBy + * @param searchName + * @param searchKeyword + * @param unionId + * @param unitId + * @param threeUnitId + * @param unionGroupId + * @param personType + * @param userState + * @param paymentProjectId + * @param year + * @param isPay + * @param schoolTimeStart + * @param schoolTimeEnd + * @param retireDateStart + * @param retireDateEnd + * @param search + * @return + */ + Sql getSummarySql(String pageOrderName, String pageOrderBy, String searchName, String searchKeyword, + String unionId, String unitId, String threeUnitId, String unionGroupId, + String personType, String userState, String paymentProjectId, String year, + String isPay,String schoolTimeStart, String schoolTimeEnd, String retireDateStart, + String retireDateEnd, String search); +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java new file mode 100644 index 00000000..5a7d6a17 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/service/impl/MemberPaymentServiceImpl.java @@ -0,0 +1,174 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.service.impl; + +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; +import cn.hutool.core.util.StrUtil; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.base.service.impl.BaseServiceImpl; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentConfig; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentInfo; +import com.budwk.app.zhgh.staffmanage.memberCost.model.MemberPaymentProject; +import com.budwk.app.zhgh.staffmanage.memberCost.service.MemberPaymentService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +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.loader.annotation.IocBean; +import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; + +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@IocBean(args = {"refer:dao"}) +public class MemberPaymentServiceImpl extends BaseServiceImpl implements MemberPaymentService { + public MemberPaymentServiceImpl(Dao dao) { + super(dao); + } + + @Override + public MemberPaymentProject findOneProject(String id) { + return dao().fetch(MemberPaymentProject.class, id); + } + + + @Override + public Workbook exportOrZip(List list, OutputStream outputStream) throws Exception { + List exportEntities = new ArrayList<>(); + exportEntities.add(new ExcelExportEntity("工号", "loginname", 20)); + exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); +// exportEntities.add(new ExcelExportEntity("年度", "year", 20)); + exportEntities.add(new ExcelExportEntity("缴费项目", "projectName", 20)); + exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); + exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20)); +// exportEntities.add(new ExcelExportEntity("身份证号", "idcard", 30)); + exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20)); + exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20)); + exportEntities.add(new ExcelExportEntity("所属工会", "unionname", 20)); + exportEntities.add(new ExcelExportEntity("所属单位", "unitname", 30)); + exportEntities.add(new ExcelExportEntity("是否缴费", "isPay", 10)); + exportEntities.add(new ExcelExportEntity("缴费金额", "payMoney", 10)); + exportEntities.add(new ExcelExportEntity("缴费时间", "paymentTime", 20)); + exportEntities.add(new ExcelExportEntity("备注", "remark", 30)); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + exportParams.setHeight((short) 10); + return ExcelExportUtil.exportExcel(exportParams, exportEntities, list); + } + + + @Override + public MemberPaymentConfig getConfig() { + return dao().fetch(MemberPaymentConfig.class); + } + + @Override + public List getPaymentConfigList() { + return dao().query(MemberPaymentConfig.class, Cnd.NEW().and("isDisabled", "=", "0")); + } + + @Override + public MemberPaymentConfig getConfigById(String configId) { + return dao().fetch(MemberPaymentConfig.class, configId); + } + + + /** + * 会员缴费汇总数据公共sql + * + * @param pageOrderName + * @param pageOrderBy + * @param searchName + * @param searchKeyword + * @param unionId + * @param unitId + * @param threeUnitId + * @param unionGroupId + * @param personType + * @param userState + * @param paymentProjectId + * @param year + * @param isPay + * @param schoolTimeStart + * @param schoolTimeEnd + * @param retireDateStart + * @param retireDateEnd + * @param search + * @return + */ + @Override + public Sql getSummarySql(String pageOrderName, String pageOrderBy, String searchName, String searchKeyword, String unionId, String unitId, String threeUnitId, String unionGroupId, String personType, String userState, String paymentProjectId, String year, String isPay, String schoolTimeStart, String schoolTimeEnd, String retireDateStart, String retireDateEnd, String search) { + Sql sql = Sqls.create(""" + SELECT + mpi.*, + (IFNULL( mpi.paymentMoney, 0 ) / 100) AS payMoney, + IF(mpi.isPayment = 1,'已缴费','未缴费') AS isPay, + mpp.projectName, + u.username, + u.sex, + u.member, + u.welfareMember, + u.unionName AS unionname, + u.unionId AS unionid, + u.unitName AS unitname, + u.unitId AS unitid, + u.mobile, + u.birthday, + u.arrivalAtSchoolDate AS schoolTime, + u.retireDate + FROM + `member_payment_info` mpi + LEFT JOIN `vw_user` u ON u.id = mpi.userId + left join `member_payment_project` mpp on mpp.id = mpi.paymentProjectId + $condition + """); + Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(searchName) && StrUtil.isNotBlank(searchKeyword)) { + cnd.and(Cnd.likeEX(searchName, searchKeyword)); + } + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) { + cnd.and("u.unionid", "=", SecurityUtil.getUnionId()); + } else { + cnd.and("u.id", "=", SecurityUtil.getUserId()); + } + } + if (Strings.isNotBlank(search)) { + cnd.orEX("u.username", "like", "%" + search + "%"); + } + cnd.andEX("mpp.`year`", "=", year); + cnd.andEX("mpi.paymentProjectId", "=", paymentProjectId); + if (Strings.isNotBlank(isPay) && !"null".equals(isPay)) { + cnd.andEX("mpi.isPayment", "=", "true".equals(isPay) ? 1 : 0); + } + cnd.andEX("u.unionId", "=", unionId); + cnd.andEX("u.unitId", "=", unitId); + cnd.andEX("u.personType", "=", personType); + cnd.andEX("u.userState", "=", userState); + + cnd.andEX("u.arrivalAtSchoolDate", ">=", schoolTimeStart); + cnd.andEX("u.arrivalAtSchoolDate", "<=", schoolTimeEnd); + + cnd.andEX("u.retireDate", ">=", retireDateStart); + cnd.andEX("u.retireDate", "<=", retireDateEnd); + cnd.groupBy("u.id"); + + if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) { + cnd.orderBy(pageOrderName, "ascending".equalsIgnoreCase(pageOrderBy) ? "ASC" : "DESC"); + } else { + cnd.desc("mpi.isPayment"); + cnd.desc("mpi.paymentTime"); + cnd.asc("u.loginname"); + } + sql.setCondition(cnd); + return sql; + } +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/template/MemberPaymentTemp.java b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/template/MemberPaymentTemp.java new file mode 100644 index 00000000..de5d4e2b --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/memberCost/template/MemberPaymentTemp.java @@ -0,0 +1,34 @@ +package com.budwk.app.zhgh.staffmanage.memberCost.template; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +@Data +public class MemberPaymentTemp { + + @Excel(name = "工号") + private String loginname; + + @Excel(name = "姓名") + private String username; + + @Excel(name = "缴纳金额") + private String paymentBase; + + @Excel(name = "是否缴费") + private Boolean isPay; + +// @Excel(name = "缴纳基数2") +// String paymentBaseTwo; + +// @Excel(name = "缴费金额") +// String paymentMoney; +// +// @Excel(name = "缴费日期") +// Date paymentTime; + + @Excel(name = "备注") + String remark; + + String result; +} diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java index dac9a17e..4584ffaf 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java @@ -10,7 +10,7 @@ import com.budwk.app.bpm.service.BpmService; import com.budwk.app.bpm.vo.BpmTaskApprovalRecordVo; import com.budwk.app.sys.models.Sys_user_history; import com.budwk.app.sys.services.SysUserService; -import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; +import com.budwk.app.zhgh.staffmanage.member.service.MemberCommonService; import com.budwk.app.zhgh.staffmanage.sourcechange.param.SourceChangePageForm; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,7 +21,6 @@ import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -48,7 +47,7 @@ public class SourceChangeManageController { @Inject private SysUserService sysUserService; @Inject - private MemberManageService memberManageService; + private MemberCommonService memberCommonService; @At("") @Ok("beetl:/platform/zhgh/staffmanage/sourcechange/manage/index.html") @@ -118,22 +117,24 @@ public class SourceChangeManageController { @ApiOperation("人员管理,人员全部变更信息查看") @SaCheckPermission("staff.sourcechange.manage") public Result getChangeInfoByUserId(String userId) { - return Result.success(memberManageService.getMemberChangeInfoByUserId(userId)); +// return Result.success(memberCommonService.memberHistoryRecordsByUserId(userId)); + return Result.success(); } @At @ApiOperation("人员管理,人员当前变更信息查看") @SaCheckPermission("staff.sourcechange.manage") public Result findAuditChangeInfo(@Valid String recordId) { - Sys_user_history history = memberManageService.dao().fetch(Sys_user_history.class, recordId); - List nodeTasks = new ArrayList<>(); - try { - nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_BRANCH_UNION_CHANGE, recordId); - } catch (Exception e) { - log.error("FIND_AUDIT_CHANGE_INFO BY BpmTaskApprovalRecordVo error:{}", e.getMessage()); - } - - List list = memberManageService.compareMemberChangeInfo(history); - return Result.success(NutMap.NEW().addv("changeList", list).addv("nodeTasks", nodeTasks).addv("remark", history.getRemark())); +// Sys_user_history history = memberCommonService.dao().fetch(Sys_user_history.class, recordId); +// List nodeTasks = new ArrayList<>(); +// try { +// nodeTasks = bpmService.getNodeTasks(BpmProcessConstant.MEMBER_BRANCH_UNION_CHANGE, recordId); +// } catch (Exception e) { +// log.error("FIND_AUDIT_CHANGE_INFO BY BpmTaskApprovalRecordVo error:{}", e.getMessage()); +// } +// +// List list = memberCommonService.compareMemberChangeInfo(history); +// return Result.success(NutMap.NEW().addv("changeList", list).addv("nodeTasks", nodeTasks).addv("remark", history.getRemark())); + return Result.success(); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java index 29f8cc4e..bae54621 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java @@ -101,7 +101,6 @@ public class SpecialStaffManageController { public Result addSpecialStaff(@Param("data") SpecialStaffVo specialStaffVo) { SpecialStaff staff = new SpecialStaff(); Sys_user user = dao.fetch(Sys_user.class, specialStaffVo.getUserId()); - boolean isNotify = false; View_user viewUser = dao.fetch(View_user.class, Cnd.where("id", "=", specialStaffVo.getUserId())); SpecialStaff specialStaff = dao.fetch(SpecialStaff.class, Cnd.where("userId", "=", specialStaffVo.getUserId())); if (Lang.isNotEmpty(specialStaff)) { @@ -109,26 +108,23 @@ public class SpecialStaffManageController { } BeanUtil.copyProperties(specialStaffVo, staff); if (specialStaffVo.getIsManyUnit()!=null && specialStaffVo.getIsManyUnit()) { - - if (!user.getUnitId().equals(specialStaffVo.getUnionRelationUnitId())) { - isNotify = true; - } // 如果是多单位人员, 更改单位为工会关系 - user.setUnitId(specialStaffVo.getUnionRelationUnitId()); +// user.setUnitid(specialStaffVo.getUnionRelationUnitId()); +// user.setThreeUnitId(specialStaffVo.getUnionRelationThreeUnitId()); +// user.setIsManyUnit(true); dao.updateIgnoreNull(user); - staff.setIsManyUnit(true); + staff.setPersonnelRelationUnitId(viewUser.getUnitId()); staff.setPersonnelRelationUnitName(viewUser.getUnitName()); + staff.setPersonnelRelationUnionId(viewUser.getUnionId()); staff.setPersonnelRelationUnionName(viewUser.getUnionName()); +// staff.setPersonnelRelationThreeUnitId(viewUser.getThreeUnitId()); +// staff.setPersonnelRelationThreeUnitName(viewUser.getThreeUnitName()); +// staff.setPersonnelRelationUnionGroupId(viewUser.getUnionGroupId()); +// staff.setPersonnelRelationUnionGroupName(viewUser.getUnionGroupName()); } staff.setUserId(user.getId()); dao.insertOrUpdate(staff); - sysRoleService.clearCache(); - sysUserService.clearCache(); - - if (isNotify) { - SysUserPublisher.notify(SysUserEvent.builder().userId(user.getId()).memberChangeType(MemberChangeType.UNIT_CHANGE).build()); - } return Result.success(); } @@ -140,7 +136,9 @@ public class SpecialStaffManageController { public Result removeSpecialStaff(@Valid String userId) { SpecialStaff staff = dao.fetch(SpecialStaff.class, Cnd.where("userId", "=", userId)); if (staff.getIsManyUnit()) { - dao.update(Sys_user.class, Chain.make("unitId", staff.getPersonnelRelationUnitId()), Cnd.where("id", "=", userId)); + dao.update(Sys_user.class, Chain.make("unitId", staff.getPersonnelRelationUnitId()) + .add("threeUnitId", staff.getPersonnelRelationThreeUnitId()) + .add("isManyUnit", null), Cnd.where("id", "=", userId)); SysUserPublisher.notify(SysUserEvent.builder().userId(userId).memberChangeType(MemberChangeType.UNIT_CHANGE).build()); } dao.clear(SpecialStaff.class, Cnd.where("userId", "=", userId)); @@ -151,18 +149,31 @@ public class SpecialStaffManageController { @At @ApiOperation("特别人员管理,查询用户") @SaCheckPermission("staff.special.manage") - public Result queryUser(String keyWord) { + public Result queryUser(String keyWord, Boolean flag) { Sql sql = Sqls.create(""" - select id,username,loginname,unitId,unitName,unionId,unionName from `vw_user` $condition limit 0,10 + select + id, + username, + loginname, + unitId, + unitName, + unionId, + unionName + from + `vw_user` + $condition """); Cnd cnd = Cnd.NEW(); - cnd.where("id", "not in", "(select userId from special_staff)"); + if (flag) { + cnd.and("id", "not in", "(select userId from special_staff)"); + } if (StrUtil.isNotBlank(keyWord)) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.orLike("username", keyWord); seg.orLike("loginname", keyWord); cnd.and(seg); } + cnd.limit(0, 10); sql.setCondition(cnd); List list = specialStaffManageService.listMap(sql); return Result.success(list); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/model/SpecialStaff.java b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/model/SpecialStaff.java index 1be95f19..2c3703d4 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/model/SpecialStaff.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/model/SpecialStaff.java @@ -30,6 +30,9 @@ public class SpecialStaff extends BaseModel { @ColDefine(type = ColType.VARCHAR, width = 32) private String userId; + /** + * 人事关系 + */ @Column @Comment("人事关系部门") @ColDefine(type = ColType.VARCHAR, width = 32) @@ -40,6 +43,11 @@ public class SpecialStaff extends BaseModel { @ColDefine(type = ColType.VARCHAR, width = 100) private String personnelRelationUnitName; + @Column + @Comment("人事关系工会") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String personnelRelationUnionId; + @Column @Comment("人事关系工会名称") @ColDefine(type = ColType.VARCHAR, width = 100) @@ -51,25 +59,59 @@ public class SpecialStaff extends BaseModel { private String personnelRelationThreeUnitId; @Column - @Comment("人事关系三级单位") + @Comment("人事关系三级单位名称") @ColDefine(type = ColType.VARCHAR, width = 100) private String personnelRelationThreeUnitName; + @Column + @Comment("人事关系工会小组") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String personnelRelationUnionGroupId; + @Column @Comment("人事关系工会小组名称") @ColDefine(type = ColType.VARCHAR, width = 100) private String personnelRelationUnionGroupName; + + /** + * 工会关系 + */ @Column @Comment("工会关系部门") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionRelationUnitId; + @Column + @Comment("工会关系部门名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionRelationUnitName; + + @Column + @Comment("工会关系工会") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionRelationUnionId; + + @Column + @Comment("工会关系工会名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionRelationUnionName; + @Column @Comment("工会关系三级单位") @ColDefine(type = ColType.VARCHAR, width = 32) private String unionRelationThreeUnitId; + @Column + @Comment("工会关系三级单位名称") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String unionRelationThreeUnitName; + + @Column + @Comment("工会关系小组") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionRelationUnionGroupId; + @Column @Comment("工会关系小组名称") @ColDefine(type = ColType.VARCHAR, width = 100) @@ -90,4 +132,6 @@ public class SpecialStaff extends BaseModel { @Comment("特殊人员备注") @ColDefine(type = ColType.VARCHAR, width = 200) private String specialStaffRemark; + + } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java index 39060bee..4be5c541 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java @@ -43,13 +43,13 @@ public class SpecialStaffManageServiceImpl extends BaseServiceImpl u.welfareMember, u.personType, u.userState, - u.unitName AS unionRelationUnitName, - u.unionName AS unionRelationUnionName, u.mobile, + dict.`name` AS distSpecialStaffType, u.birthday FROM `special_staff` s LEFT JOIN `vw_user` u ON s.userId = u.id + LEFT JOIN `sys_dict` dict ON dict.`code` = s.specialStaffType $condition """); Cnd cnd = Cnd.NEW(); @@ -88,9 +88,13 @@ public class SpecialStaffManageServiceImpl extends BaseServiceImpl id AS userId, username, loginname, - unitId AS personnelRelationUnitId, - unitName AS personnelRelationUnitName, - unionName AS personnelRelationUnionName, + unitid AS personnelRelationUnitId, + unitname AS personnelRelationUnitName, + unionname AS personnelRelationUnionName, + threeUnitId AS personnelRelationThreeUnitId, + threeUnitName AS personnelRelationThreeUnitName, + unionGroupId AS personnelRelationUnionGroupId, + unionGroupName AS personnelRelationUnionGroupName, userState, personType, mobile diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/hf.svg b/src/main/resources/static/assets/mobile/svg/memberPay/hf.svg new file mode 100644 index 00000000..44f321b0 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/hf.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg b/src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg new file mode 100644 index 00000000..967d95d8 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/money.svg b/src/main/resources/static/assets/mobile/svg/memberPay/money.svg new file mode 100644 index 00000000..a104a4e5 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/money.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/payFail.png b/src/main/resources/static/assets/mobile/svg/memberPay/payFail.png new file mode 100644 index 00000000..9bd2a26b Binary files /dev/null and b/src/main/resources/static/assets/mobile/svg/memberPay/payFail.png differ diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/paySuccess.svg b/src/main/resources/static/assets/mobile/svg/memberPay/paySuccess.svg new file mode 100644 index 00000000..1cda4d31 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/paySuccess.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/wx.svg b/src/main/resources/static/assets/mobile/svg/memberPay/wx.svg new file mode 100644 index 00000000..6ae981ec --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/wx.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/wx_img.png b/src/main/resources/static/assets/mobile/svg/memberPay/wx_img.png new file mode 100644 index 00000000..dd3d9e2f Binary files /dev/null and b/src/main/resources/static/assets/mobile/svg/memberPay/wx_img.png differ diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/yjf.svg b/src/main/resources/static/assets/mobile/svg/memberPay/yjf.svg new file mode 100644 index 00000000..34d8277b --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/yjf.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/zf_img.png b/src/main/resources/static/assets/mobile/svg/memberPay/zf_img.png new file mode 100644 index 00000000..c3ae16bb Binary files /dev/null and b/src/main/resources/static/assets/mobile/svg/memberPay/zf_img.png differ diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/zfb.svg b/src/main/resources/static/assets/mobile/svg/memberPay/zfb.svg new file mode 100644 index 00000000..48cd7697 --- /dev/null +++ b/src/main/resources/static/assets/mobile/svg/memberPay/zfb.svg @@ -0,0 +1 @@ + diff --git a/src/main/resources/static/assets/platform/js/tool/businessTool.js b/src/main/resources/static/assets/platform/js/tool/businessTool.js index 84fab627..d949c332 100644 --- a/src/main/resources/static/assets/platform/js/tool/businessTool.js +++ b/src/main/resources/static/assets/platform/js/tool/businessTool.js @@ -81,5 +81,17 @@ const businessTool = { return "" } }) + }, + getEnumOptions(name = null) { + return commonUtil + .axiosService() + .post("/open/common/dictEnumOptions", {name}) + .then((resp) => { + if (resp.code === 0) { + return resp.data + } else { + return [] + } + }) } } diff --git a/src/main/resources/static/assets/platform/module/mall/addGoods.css b/src/main/resources/static/assets/platform/module/mall/addGoods.css new file mode 100644 index 00000000..555c309a --- /dev/null +++ b/src/main/resources/static/assets/platform/module/mall/addGoods.css @@ -0,0 +1,530 @@ +/*选择商品品类*/ +.content-goods-publish { + padding: 15px; + margin: 0 auto; + text-align: center; + border-radius: 0.8em; + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + background: none repeat 0 0 #fff; + + /*商品品类*/ + .goods-category { + min-height: 500px; + border-radius: 0.8em; + text-align: left; + padding: 10px; + background: #ededed; + + ul { + padding: 12px 8px; + list-style: none; + width: 300px; + background: none repeat 0 0 #fff; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04); + border-radius: 0.4em; + display: inline-block; + letter-spacing: normal; + margin-right: 15px; + vertical-align: top; + word-spacing: normal; + + li { + line-height: 20px; + padding: 10px 5px; + cursor: pointer; + color: #333; + font-size: 12px; + display: flex; + flex-wrap: nowrap; + flex-direction: row; + justify-content: space-between; + align-items: center; + } + } + } + + /** 当前品类被选中的样式 */ + .activeClass { + border-radius: 0.4em; + background-color: color-mix(in srgb, var(--color-primary) 20%, transparent); + border: 1px solid color-mix(in srgb, var(--color-primary) 80%, transparent); + /*background-color: rgba(33, 112, 80, 0.2);*/ + /*border: 1px solid rgba(33, 112, 80, 0.8);*/ + color: #fff; + } + + /*!*当前选择的商品品类文字*!*/ + .current-goods-category { + text-align: left; + padding: 10px; + width: 100%; + border: 1px solid #fbeed5; + color: #c09853; + background-color: #fcf8e3; + margin: 10px auto; + padding: 8px 35px 8px 14px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + font-size: 12px; + font-weight: bold; + } +} + +/*编辑基本信息*/ +.el-form { + padding-bottom: 80px; + + .el-form-item { + width: 100%; + text-align: left; + } +} + +.sku-val { + justify-content: flex-start; + flex-wrap: wrap; + + >.ivu-form { + flex-wrap: wrap !important; + } + + /deep/ .sku-item-content-val { + margin-right: 20px; + } +} + +div.base-info-item { + h4 { + margin-bottom: 10px; + padding: 0 10px; + border: 1px solid #ddd; + background-color: #f8f8f8; + font-weight: bold; + color: #333; + font-size: 14px; + line-height: 40px; + text-align: left; + } + + >div { + padding-left: 5%; + } + + .form-item-view { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: space-between; + // padding-left: 80px; + + .form-item-view-wholesale { + display: flex; + + .form-item-view-wholesale-preview { + padding-left: 5%; + } + + } + + .layout { + margin-bottom: 20px; + width: 100%; + justify-content: center; + + .sku-item-content { + margin: 20px 0; + display: flex; + width: 100% !important; + flex: 1; + + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + width: 100%; + + >.ivu-card-body { + width: 100%; + } + + .ivu-card-body { + width: 100%; + justify-content: center; + align-items: flex-start; + } + + .sku-item-content-name { + display: flex; + align-items: flex-start; + justify-content: flex-start; + width: 100%; + } + } + } + + .shop-category-text { + font-size: 12px; + } + } + + .form-item-view-bottom { + margin-bottom: 50px; + } + + .item-goods-properts-row { + display: flex; + flex-direction: row; + word-break: break-all; + white-space: normal; + width: 300px; + height: 100px; + } + + .item-goods-properts { + display: flex; + flex-direction: row; + margin-bottom: 10px; + } + + .form-item { + display: flex; + align-items: center; + } + + /** 审核信息-拒绝原因 */ + .auth-info { + color: red; + } + + .el-form-item { + width: 30%; + min-width: 300px; + } + + .goods-name-width { + width: 50%; + min-width: 300px; + } + + .el-form-item__content { + margin-left: 120px; + text-align: left; + } + + p.goods-group-manager { + padding-left: 7.5%; + text-align: left; + color: #999; + font-size: 13px; + } + + /*teatarea*/ + /deep/ .el-textarea { + width: 150%; + } + + .seo-text { + width: 150%; + } +} + +/*折叠面板*/ +.el-collapse-item { + /deep/ .el-collapse-item__header { + text-align: left; + background-color: #f8f8f8; + padding: 0 10px; + font-weight: bold; + color: #333; + font-size: 14px; + } + + .el-form-item { + margin-left: 5%; + width: 25%; + } + + /deep/ .el-form-item__content { + margin-left: 120px; + text-align: left; + } + + p.goods-group-manager { + padding-left: 12%; + text-align: left; + color: #999; + } + + /deep/ .el-collapse-item__content { + padding: 10px 0; + text-align: left; + } +} + +.success { + >h1 { + font-size: 28px; + } + + >* { + margin: 10px; + } +} + +.operation { + >* { + margin: 10px 0; + } +} + +/*商品描述*/ +.goods-intro { + line-height: 40; +} + +/** 底部步骤 */ +.footer { + width: 100%; + margin-top: 20px; + padding: 10px; + background-color: #ffc; + position: sticky; + bottom: 0px; + text-align: center; + z-index: 999; + + >.ivu-btn { + margin: 0 10px; + } +} + +/*图片上传组件第一张图设置封面*/ +.goods-images { + /deep/ li.el-upload-list__item:first-child { + position: relative; + } + + /deep/ li.el-upload-list__item:first-child:after { + content: "封"; + color: #fff; + font-weight: bold; + font-size: 12px; + position: absolute; + left: -15px; + top: -6px; + width: 40px; + height: 24px; + padding-top: 6px; + background: #13ce66; + text-align: center; + -webkit-transform: rotate(-45deg); + transform: rotate(-45deg); + -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2); + } +} + +.el-form-item__label { + word-break: break-all; +} + +.step-list { + height: 60px; + padding: 10px 30px; + background-color: #fff; + margin-bottom: 20px; + border-radius: 0.8em; + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); +} + +.add-sku-btn { + margin-top: 10px; +} + +.sku-item:not(:first-child) { + margin-top: 10px; +} + +.sku-upload-list { + text-align: center; + border: 1px solid transparent; + border-radius: 4px; + overflow: hidden; + background: #fff; + position: relative; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + margin-right: 8px; +} + +.preview-picture { + width: 100%; + margin: 0 auto; + display: block; + // text-align: center; + border: 1px solid transparent; + // justify-self: center; + // align-self: center; +} + +.preview-picture img { + width: 100%; + height: 100%; +} + +.sku-upload-list img { + width: 100%; + height: 100%; +} + +.sku-upload-list-cover { + display: none; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + background: rgba(0, 0, 0, 0.6); +} + +.sku-upload-list:hover .sku-upload-list-cover { + display: block; +} + +.sku-upload-list-cover i { + color: #fff; + font-size: 20px; + cursor: pointer; + margin: 0 2px; +} + +.required { + /deep/ .ivu-form-item-label::before { + content: "*"; + display: inline-block; + margin-right: 4px; + line-height: 1; + font-family: SimSun; + font-size: 14px; + color: #ed4014; + } +} + +.demo-upload-list { + width: 150px; + height: 150px; + text-align: center; + border: 1px solid transparent; + border-radius: 4px; + display: inline-block; + background: #fff; + position: relative; + margin-right: 4px; + vertical-align: bottom; +} + +.demo-upload-list img { + width: 100%; + height: 100%; +} + +.demo-upload-list-cover { + display: none; + position: absolute; + top: 0; + bottom: 0; + left: 0; + + right: 0; + background: rgba(0, 0, 0, 0.6); + + justify-content: space-between; + align-items: center; + flex-direction: column; +} + +.demo-upload-list:hover .demo-upload-list-cover { + display: flex; +} + +.demo-upload-list-cover div { + margin-top: 50px; + width: 100%; + + >i { + width: 50%; + margin-top: 8px; + color: #fff; + font-size: 20px; + cursor: pointer; + } +} + +.active-goods-type { + background: #e8e8e8; +} + +.goods-type-list { + max-height: 500px; + overflow-y: auto; +} + +.template-item { + justify-content: flex-start !important; +} + +.tree-bar { + height: auto !important; + max-height: auto !important; + min-height: 240px !important; +} + +.goods-type-item { + padding: 20px 0; + width: 100%; + cursor: pointer; + transition: 0.35s; + display: flex; + justify-content: center; + align-items: center; + + /deep/ img { + margin-right: 20px; + width: 100px; + margin-left: 10px; + } + + + + /deep/ p { + color: #999; + font-size: 14px; + margin-top: 10px; + } +} + +.goods-type-item:hover { + background: #ededed; +} + +.goods-list-box { + height: 450px; + overflow: auto; +} + +h2 { + cursor: pointer; + font-size: 21px; + color: #333; +} + +.form-item-view-wholesale-form-col { + height: 400px; +} + +.form-item-view-wholesale-row-del { + display: "flex"; + justify-content: "space-between"; + align-items: "center"; +} +.promise-intro-btn{ + margin: 10px 0; + text-align: left; +} diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html new file mode 100644 index 00000000..e56f0eec --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/activityManage.html @@ -0,0 +1,1916 @@ + + + +
+ + + + + + + +
+ +
+
+ + + 确 定 + + + + + + + + + + + + + + + + {{viewData.name}} + + + + + {{viewData.address}} + + + + + + + + + {{moment(viewData.apply_start_time).format('YYYY-MM-DD HH:mm:ss')}} + + + + + {{moment(viewData.apply_end_time).format('YYYY-MM-DD HH:mm:ss')}} + + + + + + + + {{moment(viewData.start_time).format('YYYY-MM-DD HH:mm:ss')}} + + + + + {{moment(viewData.end_time).format('YYYY-MM-DD HH:mm:ss')}} + + + + + + + 打卡模式 + 计步模式 + GPS模式 + + + + + {{viewData.dailyLottery?viewData.dailyLottery:'暂无'}} + + + + + {{viewData.walkingStepCount?viewData.walkingStepCount:'暂无'}} + + + + + + + +
暂无
+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + 关 闭 + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html new file mode 100644 index 00000000..700b3079 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/bindingRecord.html @@ -0,0 +1,266 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + 批量删除  + + + + + 删除已选 + + + 全部删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/punchStatistics.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/punchStatistics.html new file mode 100644 index 00000000..30519a81 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/punchStatistics.html @@ -0,0 +1,264 @@ + +
+ + + + + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html new file mode 100644 index 00000000..f7ac7d3a --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRaffle.html @@ -0,0 +1,383 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + 设置抽奖条件 + 查看中奖人员 + 导出达标人员 + + + + + + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html new file mode 100644 index 00000000..283c606c --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepRanking.html @@ -0,0 +1,177 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + 今日排行榜 + 总排行榜 + + 导出{{pageForm.mode == 'today' ? '今日排行榜' : '总排行榜'}} + + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html new file mode 100644 index 00000000..c0e42f11 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepStatistics.html @@ -0,0 +1,202 @@ + +
+ + + + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html new file mode 100644 index 00000000..52b085d9 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/activity/fitnesswalk/stepWining.html @@ -0,0 +1,187 @@ + + +
+ + + + + + + + + + + + + + + + + + 奖项名称： + + + + {{ item.name }} + + + + + + + + + 导出中奖名单 + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/data/revel.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/data/revel.html new file mode 100644 index 00000000..76d8018f --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/data/revel.html @@ -0,0 +1,460 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+ + + + 关 闭 + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/data/type.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/data/type.html new file mode 100644 index 00000000..87391201 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/data/type.html @@ -0,0 +1,207 @@ + + +
+ + + + + + + + + + + + 新增工作资料类型 + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + + + + + + + + 取 消 + 确 定 + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/apply.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/apply.html new file mode 100644 index 00000000..c801f61d --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/apply.html @@ -0,0 +1,222 @@ + + +
+ + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/components/info.js b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/components/info.js new file mode 100644 index 00000000..a6349b9b --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/components/info.js @@ -0,0 +1,66 @@ +const INFO = { + template: /*language=HTML*/ ` +
+ + + + {{ viewData.username }} + {{ viewData.loginName }} + {{ viewData.mobile }} + + {{ viewData.unionName }} + {{ viewData.applyTime }} + + +
+ 暂无 + + + +
+ 暂无 + + + + + 暂无 + + + + + + + + + +
+ `, + props: { + activeName: { + type: String, + default: '1' + } + }, + data() { + return { + activeName: '1', + viewData: {}, + organizationAudit: {}, + schoolAudit: {}, + } + }, + methods: { + async openView(id) { + const resp = await $.get('/platform/workershome/declaration/apply/getInfoById', {id: id}) + if (resp.code === 0) { + this.viewData = resp.data + this.organizationAudit = resp.data.organizationAudit + this.schoolAudit = resp.data.schoolAudit + } else { + this.viewData = {} + this.organizationAudit = {} + this.schoolAudit = {} + } + } + } +} diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/mine.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/mine.html new file mode 100644 index 00000000..747a6862 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/mine.html @@ -0,0 +1,175 @@ + + +
+ + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html new file mode 100644 index 00000000..91f5b672 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/organizationAudit.html @@ -0,0 +1,230 @@ + + +
+ + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html new file mode 100644 index 00000000..22009bb6 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/schoolAudit.html @@ -0,0 +1,286 @@ + + +
+ + + + + + + + + + + 关 闭 + 确 定 + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/statistics.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/statistics.html new file mode 100644 index 00000000..14d010ae --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/declaration/statistics.html @@ -0,0 +1,177 @@ + +
+ + + + + + + + + 关 闭 + 确 定 + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/apply.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/apply.html new file mode 100644 index 00000000..70eb9070 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/apply.html @@ -0,0 +1,347 @@ + + + + +
+ + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/info.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/info.html new file mode 100644 index 00000000..5dbda59f --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/info.html @@ -0,0 +1,223 @@ + + + + +
+ + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/mine.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/mine.html new file mode 100644 index 00000000..246a06d1 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/mine.html @@ -0,0 +1,162 @@ + + +
+ + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/schoolAudit.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/schoolAudit.html new file mode 100644 index 00000000..8120ab21 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/info/schoolAudit.html @@ -0,0 +1,229 @@ + + +
+ + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/components/addReviewProxy.js b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/components/addReviewProxy.js new file mode 100644 index 00000000..5fb1eeff --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/components/addReviewProxy.js @@ -0,0 +1,385 @@ +const ADD_REVIEW_PROXY = { + template: /*language=HTML*/ ` +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 工会评议 + 主席/副主席评议 + + + + + + + + 自我评议 + + + 教工评议 + + + + + + + + 评分模式 + 满意度模式 + + + + + + + + + + + 校工会 + + + 全部分工会 + + + + 自选分工会 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 添加测评内容 + + + +
+ +
+ + +
+ `, + props: { + is_view: {type: Boolean, default: false}, + data: { + type: Object, + default: { + nrs: [{ + bzs: [{}] + }], + unionIds: [] + } + } + }, + data() { + return { + activityGroupList: [], + isEvaluationIndex: false, + zbList: [], + formRules: { + xxx: [{required: true, message: '请填写年度', trigger: ['blur', 'change']}], + }, + pickerOptions: { + disabledDate(time) { + return ( + time.getFullYear() > new Date().getFullYear() + ); + } + }, + relationData: [ + {moduleName: '提案系统模块', id: 'proposal'}, + {moduleName: '二级教代会', id: 'secteameet'}, + {moduleName: '慰问/补助', id: 'ConandDif'}, + ], + roleDataReview: {}, + reviewUnions: [], + } + }, + components: { + 'drawer-user-scope': httpVueLoader('/components/module/activity/DrawerUserScope.vue'), + }, + methods: { + async getActivityGroup() { + const {data} = await this.$axios.get('/platform/activity/basic/scope/getActivityUserScopeGroup') + this.activityGroupList = data + }, + async getByZbData() { + const { + code, + data, + msg + } = await this.$axios.get('/platform/wakeshome/review/viewZb/edit', {id: this.data.zbId}) + if (data) { + this.$set(this.data, "nrs", data.nrs) + } else { + this.$set(this.data, "nrs", [{bzs: [{}]}]) + } + }, + async getZbList() { + const res = await this.$axios.get("/platform/wakeshome/review/Xjkhzb/getZbList") + this.zbList = res.data + }, + getSummaries(param) { + const {columns, data} = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 0 && this.data.scoringMode === 1) { + sums[index] = '小计'; + return; + } else if ([1, 3, 4].includes(index) && this.data.scoringMode === 1) { + sums[index] = ''; + return; + } else if ([1, 2, 3].includes(index) && this.data.scoringMode === 2) { + sums[index] = ''; + return; + } + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] += ' 分'; + } else { + sums[index] = ''; + } + }); + return sums; + }, + }, + async created() { + await this.getActivityGroup() + await this.getZbList() + if (!this.data || !Object.keys(this.data).length) { + this.data = { + nrs: [{ + bzs: [{inspection: null, score: null, isEvidence: true}] + }], + } + } + + if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { + this.reviewUnions = await this.$businessTool.listUnion() + } else { + this.reviewUnions = await this.$businessTool.listUnion(this.unionId) + this.$set(this.data, "unionIds", this.reviewUnions[0].id) + } + }, + watch: { + data: { + deep: true, + handler(val) { + this.$emit('change', val) + } + } + }, + computed: { + schoolContent() { + if (this.data.reviewMode == 1) { + return '勾选后，仅校工会管理员可参加测评' + } else if (this.data.reviewMode == 2) { + return '勾选后，全校所有人员可评议校工会，也可根据右侧选框【可评议人员】指定评议人员范围' + } else { + return '请选择评议模式' + } + }, + allUnionContent() { + if (this.data.reviewMode == 1) { + return '勾选后，仅各工会管理员可对本分工会进行自我评议' + } else if (this.data.reviewMode == 2) { + return '勾选后，所有分工会人员对本分工会进行评议，不可跨工会评议' + } else { + return '请选择评议模式' + } + }, + selectUnionContent() { + if (this.data.reviewMode == 1) { + return '勾选后，仅右侧选择的分工会管理员可对本分工会进行自我评议' + } else if (this.data.reviewMode == 2) { + return '勾选后，可根据右侧选框【自选分工会】指定分工会评议范围' + } else { + return '请选择评议模式' + } + } + } +} diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/components/reviewResult.js b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/components/reviewResult.js new file mode 100644 index 00000000..1cafeb0a --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/components/reviewResult.js @@ -0,0 +1,113 @@ +const REVIEW_RESULT = { + template: /*language=HTML*/ ` +
+ + + + + + + + + + + + + + + + + + + + + + +
+ 简述工作情况 + + + + + +
+ + + + + + + +
+ `, + props: { + id: {type: String, default: ''} + }, + data() { + return { + viewInfo: { + commentPeo: {}, + zbxx: [] + } + } + }, + methods:{ + async findOne(peoId){ + const resp = await this.$axios.get('/platform/wakeshome/review/statistics/getBzById',{peoId:peoId}) + if (resp.code === 0) { + this.viewInfo = resp.data + } + } + } +} diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/doReview.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/doReview.html new file mode 100644 index 00000000..dfeece78 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/doReview.html @@ -0,0 +1,444 @@ + + +
+ + + + + + + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/khzb.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/khzb.html new file mode 100644 index 00000000..8f3ae51d --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/khzb.html @@ -0,0 +1,211 @@ + + +
+ + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/statistics.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/statistics.html new file mode 100644 index 00000000..41762ff3 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/statistics.html @@ -0,0 +1,421 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/xjkhzb.html b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/xjkhzb.html new file mode 100644 index 00000000..667cfaaf --- /dev/null +++ b/src/main/resources/views/platform/zhgh/dayofficework/workershome/review/xjkhzb.html @@ -0,0 +1,137 @@ + + +
+ + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html new file mode 100644 index 00000000..686fad2e --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html @@ -0,0 +1,541 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html new file mode 100644 index 00000000..24d601b7 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html @@ -0,0 +1,177 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + 帮扶申请 + + + + + + + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html new file mode 100644 index 00000000..0feb2031 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/form.html @@ -0,0 +1,45 @@ +
+ + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html new file mode 100644 index 00000000..6651bfbd --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html @@ -0,0 +1,141 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html new file mode 100644 index 00000000..e0049de8 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/form.html @@ -0,0 +1,49 @@ +
+ + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html new file mode 100644 index 00000000..6651bfbd --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html @@ -0,0 +1,141 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html new file mode 100644 index 00000000..b6cedfc3 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html @@ -0,0 +1,126 @@ +
+ + {{ viewData.proxyUserName }} + {{ viewData.proxyLoginName }} + {{ viewData.mode == 1 ? '本人申请' : '替他人申请' }} + + {{ viewData.userName + '(' + viewData.loginName + ')' }} + {{ viewData.sex }} + {{ viewData.birthday }} + + {{ viewData.unionName }} + {{ viewData.unitName }} + {{ viewData.officialCapacity }} + + {{ viewData.mobile }} + {{ viewData.idCard }} + + {{ viewData.monthlyIncome }} + {{ viewData.bankCardNum }} + + {{ viewData.subsidyStandards }} + + {{ viewData.reason }} + + + + + + + + + + + + + + 暂无 + + + + + 暂无 + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/form.html new file mode 100644 index 00000000..d08e1ab0 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/form.html @@ -0,0 +1,45 @@ +
+ + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html new file mode 100644 index 00000000..f0c0e5c4 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html @@ -0,0 +1,126 @@ + +
+ + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionaudit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionaudit/index.html deleted file mode 100644 index 6b24647c..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionaudit/index.html +++ /dev/null @@ -1,233 +0,0 @@ - -
- - - - - -
- - diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js new file mode 100644 index 00000000..e34ef3d6 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js @@ -0,0 +1,85 @@ +const COMMON_QUERY = { + template: /*language=HTML*/ ` + + + + + + + `, + store, + mixins: [initTableMixins], + data() { + return{ + unions: [], + units: [], + pageForm: { + searchKeyword: '', + unionId: '', + unitId: '', + userState: '', + personType: '' + } + } + }, + methods: { + doSearch(){ + this.$emit('search', this.pageForm) + }, + async initData(){ + if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { + this.$businessTool.listUnion(this.pageForm.unionId).then((data) => { + this.unions = data + }) + this.$businessTool.listUnit().then((data) => { + this.units = data + }) + } else if (this.$auth.hasRole("BRANCH_UNION_CHAIRMAN")) { + this.$businessTool.listUnion(this.$store.state.user.union.id).then((data) => { + this.unions = data + }) + this.$businessTool.listUnit(this.$store.state.user.union.id).then((data) => { + this.units = data + }) + } + }, + async flushUnits(){ + this.$set(this.pageForm, "unitId", null) + this.units = [] + if (this.pageForm.unionId) { + this.units = await this.$businessTool.listUnit(this.pageForm.unionId) + } + } + }, + async created() { + this.initData() + } +} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js new file mode 100644 index 00000000..62b3f165 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js @@ -0,0 +1,127 @@ +const MEMBER_APPLY_AUDIT_INFO = { + template: /*language=HTML*/ ` +
+ + + + {{ viewData.loginname }} + {{ viewData.username }} + {{ viewData.sex }} + + {{ viewData.nation }} + {{ moment(viewData.birthday).format("YYYY年MM月DD日") }} + {{ viewData.political }} + + {{ viewData.education }} + {{ viewData.academicDegree }} + {{ viewData.position }} + + {{ viewData.userUnitName }} + {{ viewData.userUnionName }} + {{ viewData.campus }} + + {{ viewData.idCard }} + {{ viewData.mobile }} + {{ viewData.email }} + + {{ viewData.userState }} + {{ viewData.personType }} + + + + + + + + + + + + + + + + +
+ 暂无 + + + + + 暂无 + + + + + +
+
+
+ {{nodeTask.nodeName}} +
+ + + {{ task.actualOwnerLoginName + '-' + task.actualOwnerUserName}} + + {{ task.endOn}} + +
+ 同意 + + 退回 + + 拒绝 + +
+ + + {{ task.extVariable.approvalOpinion }} + + + + + + +
+
+ + +
+ `, + data() { + return{ + activeName: "basicInfo", + viewData: { + nodeTasks: {} + } + } + }, + methods: { + async onOpen(id){ + const resp = await $.post('/platform/member/apply/mine/findMemberApplyRecord', {id}) + if (resp.code === 0) { + this.viewData = resp.data + this.$emit('union-name', this.viewData.userUnionName) + if (this.viewData.families) { + this.viewData.families = JSON.parse(this.viewData.families) + } else { + this.viewData.families = [] + } + } + } + } +} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html index a0e37c18..f4e44107 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html @@ -5,40 +5,7 @@ layout("/layouts/platform.html"){ - - + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html new file mode 100644 index 00000000..d3ae80ae --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html @@ -0,0 +1,532 @@ +
+ + + + + + + + + + + + + + + + 男 + 女 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 会员 + 非会员 + + + + + + + + 福利会员 + 非福利会员 + + + + + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html new file mode 100644 index 00000000..652576ea --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html @@ -0,0 +1,155 @@ + +
+ + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/oldindex.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/oldindex.html new file mode 100644 index 00000000..cb250d17 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/oldindex.html @@ -0,0 +1,60 @@ + +
+ +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/view/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/view/index.html new file mode 100644 index 00000000..983e32bb --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/view/index.html @@ -0,0 +1,165 @@ +
+ + + + {{ viewData.loginname }} + {{ viewData.username }} + {{ viewData.sex }} + + {{ viewData.nation }} + {{ viewData.birthday ? $moment(viewData.birthday).format("YYYY年MM月DD日") : '暂无' }} + {{ viewData.political }} + + {{ viewData.education }} + {{ viewData.academicDegree }} + {{ viewData.position }} + + {{ viewData.unitname }} + {{ viewData.unionname }} + {{ viewData.campus }} + + {{ viewData.idCard }} + {{ viewData.mobile }} + {{ viewData.email }} + + {{ viewData.userState }} + {{ viewData.personType }} + {{ viewData.schoolTime }} + + + + {{ viewData.member ? '会员' : '非会员' }} + {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + + + + + + + + + + + + + + + + + +
+ 无数据 + + + + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/apply/memberApply.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/apply/memberApply.js deleted file mode 100644 index fe4def2f..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/apply/memberApply.js +++ /dev/null @@ -1,252 +0,0 @@ -const MEMBER_APPLY = { - template: ` - - -

入会申请

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - `, - props: { - adminOperate: { type: Boolean, default: false }, - id: { type: String }, - url: { type: String, default: "/platform/member/apply/submit/doSubmit" } - }, - data() { - return { - formDisabled: false, - formData: { - families: [] - }, - formRules: { - userId: [{ required: true, message: "必填", trigger: "change" }], - userName: [{ required: true, message: "必填", trigger: "change" }], - sex: [{ required: true, message: "必填", trigger: "change" }], - idCard: [ - { required: true, message: "身份证号不能为空", trigger: "blur" }, - { - pattern: /(^\d{6}(18|19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9xX])$)/, - message: "身份证号格式不正确", - trigger: "blur" - } - ], - nation: [{ required: true, message: "必填", trigger: "change" }], - political: [{ required: true, message: "必填", trigger: "change" }], - education: [{ required: true, message: "必填", trigger: "change" }], - // unitName: [{ required: true, message: "必填", trigger: "change" }], - governmentPosition: [{ required: true, message: "必填", trigger: "change" }], - mobile: [ - { required: true, message: "手机号不能为空", trigger: "blur" }, - { pattern: /^1[3-9]\d{9}$/, message: "手机号格式不正确", trigger: "blur" } - ], - email: [{ required: true, message: "必填", trigger: "change" }], - wantJoinLoveMutualAidAssociation: [{ required: true, message: "必填", trigger: "change" }], - personalData: [{ required: true, message: "必填", trigger: "change" }] - }, - units: [], - isAdmin: false - // id: GetQueryString("id"), - // TASK_ID: parseInt(GetQueryString("TASK_ID")) - } - }, - methods: { - getUnionName() { - const data = this.units.find((v) => v.id === unitId) - this.$set(this.formData, "unionName", data.unionName) - }, - init() { - if (this.id) { - this.findOne(this.id) - } else { - this.assignmentFormData() - } - this.$businessTool.listUnit().then((data) => { - debugger - this.units = data - }) - this.isAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN", "BRANCH_UNION_CHAIRMAN"]) - }, - findOne(id) { - this.$axios.post("/platform/member/apply/submit/findOne", { id: id }).then((res) => { - if (res.code === 0) { - this.assignmentFormData(res.data) - } - }) - }, - doSubmit(sequenceFlowName) { - this.$axios - .post(this.url, { - ...this.formData, - TASK_ID: this.TASK_ID, - sequenceFlowName - }) - .then((res) => { - if (res.code === 0) { - this.$message.success(res.msg) - // location.href = "/platform/member/apply/mine" - } - }) - }, - assignmentFormData(data) { - const source = data - // 特定字段的默认值映射 - const defaultValues = { - families: [] - } - - const setField = (key) => { - // 检查字段是否在 defaultValues 映射中，如果在，则使用其默认值，否则从 source 获取值 - const value = defaultValues.hasOwnProperty(key) ? defaultValues[key] : source[key] - this.$set(this.formData, key, value) - } - // 遍历表单项并设置值 - this.$refs.formRef.fields.forEach((formItem) => { - setField(formItem.prop) - }) - this.$set(this.formData, "loginname", data.loginname) - this.$set(this.formData, "userId", data.id) - } - }, - created() { - // this.init() - } -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditChangeInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditChangeInfo.js deleted file mode 100644 index fbfd8827..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditChangeInfo.js +++ /dev/null @@ -1,158 +0,0 @@ -const MEMBER_AUDIT_CHANGE_INFO = { - template: - /*language=HTML*/ - ` - - - - -
-
- 当前信息 -
- - {{ viewData.username }} - {{ viewData.sex }} - {{ viewData.nation }} - {{ viewData.userState }} - - {{ viewData.personType }} - {{ viewData.education }} - {{ viewData.political }} - {{ viewData.marriage || '' }} - {{ viewData.idCard }} - {{ viewData.mobile }} - {{ viewData.email }} - {{ viewData.member ? '是' : '否' }} - {{ viewData.welfareMember ? '是' : '否' }} - - - - -
- {{ viewData.unionName + '-' + viewData.unitName + ( viewData.governmentPosition ? ( '(' - + viewData.governmentPosition + ')' ) : '' ) }} -
- - -
- -
-
- {{ '变更记录' + (remark ? ('(变更/审核说明：' + remark + ')') : '') }} -
- - - - - - - - - - -
- - - - -
-
-
- {{nodeTask.nodeName}} -
- - - {{ task.actualOwnerLoginName + '-' + task.actualOwnerUserName}} - - {{ task.endOn}} - -
- 同意 - - 退回 - - 拒绝 - -
- - - {{ task.extVariable.approvalOpinion }} - - - - - - -
-
- - - - `, - props: { - is_default_url: { - type: Boolean, - default: false - } - }, - data() { - return { - activeName: "basicInfo", - changeList: [], - nodeTasks: [], - viewData: {}, - remark: "" - } - }, - methods: { - findAuditChangeInfo(recordId) { - if (!recordId) { - return - } - let url = loc() + "/findAuditChangeInfo" - if (this.is_default_url) { - url = "/platform/sourcechange/manage/findAuditChangeInfo" - } - this.$axios.post(url, { recordId: recordId }).then((res) => { - if (res.code === 0) { - this.changeList = res.data.changeList - this.nodeTasks = res.data.nodeTasks - this.remark = res.data.remark - } - }) - }, - findUserInfo(userId) { - if (!userId) { - return - } - this.$axios.post("/platform/member/apply/common/findOne", { id: userId }).then((res) => { - if (res.code === 0) { - this.viewData = res.data - } - }) - }, - onOpen(data) { - this.findAuditChangeInfo(data.recordId) - this.$nextTick(() => { - this.findUserInfo(data.userId) - }) - } - } -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditRecord.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditRecord.js deleted file mode 100644 index 05915966..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditRecord.js +++ /dev/null @@ -1,71 +0,0 @@ -const MEMBER_AUDIT_RECORD = { - template: ` -
- - -
- `, - dicts: ["PROCESS_TASK_SUBMIT_TYPE"], - props: { - id: { - type: String, - required: true - } - }, - watch: { - id: { - handler: function (val) { - if (val) { - this.findOne() - } - }, - immediate: true - } - }, - data() { - return { - approvalRecord: [] - } - }, - methods: { - findOne() { - if (!this.id) { - return - } - this.$axios.post("/platform/wf/processCommon/approvalRecord", { businessNo: this.id }).then((res) => { - if (res.code === 0) { - this.approvalRecord = res.data - } - }) - } - } -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditTable.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditTable.js deleted file mode 100644 index 9c946316..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditTable.js +++ /dev/null @@ -1,201 +0,0 @@ -const MEMBER_AUDIT_TABLE = { - template: ` -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 已审核 - 未审核 - - - - - - - - - - - - - - - - - - - -
- `, - mixins: [initTableMixins], - data() { - return { - pageForm: { - audit: false - }, - tableColumns: [ - { prop: "loginname", label: "工号", sortable: true }, - { prop: "username", label: "姓名", sortable: true }, - { prop: "userState", label: "在职状态", sortable: true }, - { prop: "preparedBy", label: "聘用方式", sortable: true }, - { prop: "personType", label: "人员类型", sortable: true }, - { prop: "unionName", label: "所属工会", sortable: true }, - { prop: "unitName", label: "所属单位", sortable: true }, - { prop: "processInstanceNodeName", label: "当前节点", sortable: true } - ], - unions: [], - units: [], - changeTypeData: [], - auditChangeVisible: false, - userId: "", - recordId: "" - } - }, - methods: { - // 审核 - openApproval(row) { - this.$emit("open-approval", row) - }, - // 退回 - openRevoke(taskId) { - this.$confirm("您确定要撤回吗?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post(loc() + "/revoke", { taskId }).then((resp) => { - this.$message.success(resp.msg) - this.doSearch() - }) - }) - }, - openEdit(row) { - this.$emit("open-edit", row) - }, - openUserChangeInfo(row) { - this.$emit("open-change-view", row) - }, - getChangeTypes(changeTypes) { - if (changeTypes) { - if (!changeTypes || changeTypes.length === 0 || !this.changeTypeData || this.changeTypeData.length === 0) return null - return changeTypes - .map((v) => { - return this.changeTypeData.find((item) => item.code === v).name - }) - .join(",") - } - return null - }, - openView(userId) { - this.$emit("open-view", userId) - }, - openChangeView(row) { - this.$emit("open-change-view", row) - }, - pageData() { - this.$axios.post(loc() + "/pageData", this.pageForm).then((res) => { - if (res.code === 0) { - this.tableData = res.data.list - this.pageForm.totalCount = res.data.totalCount - } - }) - }, - initData() { - if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { - this.$businessTool.listUnion(this.pageForm.unionId).then((data) => { - this.unions = data - }) - } else { - this.$businessTool.listUnion(this.$store.state.user.union.id).then((data) => { - this.unions = data - }) - } - this.doSearch() - }, - flushUnits() { - this.$set(this.pageForm, "unitId", null) - this.units = [] - if (this.pageForm.unionId) { - this.$businessTool.listUnit(this.pageForm.unionId).then((data) => { - this.units = data - }) - } - } - }, - async created() { - this.initData() - this.changeTypeData = await this.$businessTool.getAllDictOptions("MEMBER_CHANGE_TYPE") - } -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js deleted file mode 100644 index 4835e518..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChange.js +++ /dev/null @@ -1,368 +0,0 @@ -const MEMBER_CHANGE = { - template: /*language=HTML*/ ` - -

信息变更

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - - - - - - - - - - - - - - - - {{item.name}} - - - - - - - - - - - - - - - - - - 关 闭 - 提 交 - - - `, - props: { - id: { type: String, required: true }, - url: { type: String, required: true }, - edit: { type: Boolean, default: false }, - showClose: { type: Boolean, default: false } - }, - store, - data() { - return { - formDisabled: false, - formData: { - families: [], - changeMember: null, - changeWelfareMember: null, - changeWantJoinLoveMutualAidAssociation: null, - verificationProjectId: "" - }, - formRules: { - username: [{ required: false, message: "必填", trigger: "change" }], - sex: [{ required: false, message: "必填", trigger: "change" }], - idCard: [ - { required: false, message: "身份证号不能为空", trigger: "blur" }, - { - pattern: /(^\d{6}(18|19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9xX])$)/, - message: "身份证号格式不正确", - trigger: "blur" - } - ], - nation: [{ required: false, message: "必填", trigger: "change" }], - political: [{ required: false, message: "必填", trigger: "change" }], - education: [{ required: false, message: "必填", trigger: "change" }], - unitName: [{ required: false, message: "必填", trigger: "change" }], - governmentPosition: [{ required: false, message: "必填", trigger: "change" }], - mobile: [ - { required: true, message: "手机号不能为空", trigger: "blur" }, - { pattern: /^1[3-9]\d{9}$/, message: "手机号格式不正确", trigger: "blur" } - ], - email: [{ required: false, message: "必填", trigger: "change" }], - changeWantJoinLoveMutualAidAssociation: [{ required: false, message: "必填", trigger: "change" }], - personalData: [{ required: false, message: "必填", trigger: "change" }] - }, - allowChangeFields: [], - units: [], - changeTypeOptions: [] - } - }, - methods: { - clickDataType(e) { - e === this.formData.changeType ? (this.formData.changeType = "") : (this.formData.changeType = e) - this.doSetMemberStatus(e) - }, - doSetMemberStatus(name) { - this.$set(this.formData, "changeMember", name ? name === "RESTORE" : "") - this.$set(this.formData, "changeWelfareMember", name ? name === "RESTORE" : "") - this.$set(this.formData, "changeWantJoinLoveMutualAidAssociation", name ? name === "RESTORE" : "") - }, - init() { - if (this.id) { - this.findOne(this.id, this.edit) - } - if (!this.allowChangeFields || this.allowChangeFields.length === 0) { - this.$businessTool.getDictOptions("MEMBER_ALLOW_CHANGES_FIELD").then((data) => { - this.allowChangeFields = data.map((v) => v.code) - }) - } - if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { - this.$businessTool.listUnit().then((data) => { - this.units = data - }) - } else { - this.$businessTool.listUnit(this.$store.state.user.union.id).then((data) => { - this.units = data - }) - } - this.$businessTool.getDictOptions("MEMBER_CHANGE_TYPE").then((data) => { - this.changeTypeOptions = data - }) - }, - assignmentFormData(data) { - const source = data - // 特定字段的默认值映射 - const defaultValues = { - families: [] - } - - const setField = (key) => { - // 检查字段是否在 defaultValues 映射中，如果在，则使用其默认值，否则从 source 获取值 - const value = defaultValues.hasOwnProperty(key) ? defaultValues[key] : source[key] - this.$set(this.formData, key, value) - } - // 遍历表单项并设置值 - this.$refs.formRef.fields.forEach((formItem) => { - setField(formItem.prop) - }) - this.$set(this.formData, "loginname", data.loginname) - this.$set(this.formData, "userId", data.id) - }, - findOne(id, isEdit) { - this.$axios.post("/platform/member/apply/submit/findOne", { id: id, isEdit: isEdit }).then((res) => { - if (res.code === 0) { - this.assignmentFormData(res.data) - } - }) - }, - allowFields(prop) { - return !this.allowChangeFields.includes(prop) - }, - getUnionName(unitId) { - const data = this.units.find((v) => v.id === unitId) - this.$set(this.formData, "unionName", data.unionName) - }, - doSubmit() { - //是否确认提交？ - this.$confirm("是否确认提交？提交后将进入审核流程，请仔细核对变更数据是否准确！", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.setSubmitUserMemberStatus() - if (this.edit) { - this.formData.edit = this.edit - this.formData.id = this.id - } - this.$axios - .post(this.url, { - record: JSON.stringify(this.formData), - approvalRemark: this.formData.approvalRemark - }) - .then((res) => { - if (res.code === 0) { - this.$message.success(res.msg) - this.$emit("submit-ready", null) - } - }) - }) - }, - setSubmitUserMemberStatus() { - if (this.formData.changeType) { - this.formData.member = this.formData.changeMember - this.formData.welfareMember = this.formData.changeWelfareMember - } - }, - verificationInit(data) { - this.allowChangeFields = data.renewFields - this.$set(this.formData, "changeOrigin", data.changeOrigin) - this.$set(this.formData, "verificationProjectId", data.verificationProjectId) - this.init() - } - }, - created() {} -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChangeInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChangeInfo.js deleted file mode 100644 index 623b198a..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChangeInfo.js +++ /dev/null @@ -1,108 +0,0 @@ -const MEMBER_CHANGE_INFO = { - template: /*language=html*/ ` - -
-
- 当前信息 -
- - {{ viewData.username }} - {{ viewData.sex }} - {{ viewData.nation }} - {{ viewData.userState }} - - {{ viewData.personType }} - {{ viewData.education }} - {{ viewData.political }} - {{ viewData.marriage || '' }} - {{ viewData.idCard }} - {{ viewData.mobile }} - {{ viewData.email }} - {{ viewData.member ? '是' : '否' }} - {{ viewData.welfareMember ? '是' : '否' }} - - - -
- {{ viewData.unionName + '-' + viewData.unitName + ( viewData.governmentPosition ? ( '(' + viewData.governmentPosition + ')' ) : '' ) }} -
- - -
- -
-
- 变更信息 -
- - - - - - -
-
-
变更/审核说明:
-
-
- {{ item.remark }} -
-
- - - - - - - - - - - - - - -
- - `, - data() { - return { - viewList: [], - activeName: "", - viewData: {} - } - }, - methods: { - formattedTitle(title) { - const datePattern = /\(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\)/ - return title.replace(datePattern, '$&') - }, - onOpen(id, changeTime) { - if (!id) { - return - } - this.$axios.post(loc() + "/getChangeInfoByUserId", { userId: id }).then((res) => { - if (res.code === 0) { - this.viewList = res.data.sort((a, b) => new Date(b.title) - new Date(a.title)) - this.activeName = changeTime || (this.viewList && this.viewList.length > 0 ? this.viewList[0].changeTime : "") - this.findUserInfo(id) - } - }) - }, - findUserInfo(id) { - this.$axios.post("/platform/member/apply/common/findOne", { id }).then((res) => { - if (res.code === 0) { - this.viewData = res.data - } - }) - } - } -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js index 02d1690a..520cf639 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js @@ -5,60 +5,62 @@ {{ viewData.loginname }} {{ viewData.username }} - {{ viewData.username }} {{ viewData.sex }} - {{ viewData.birthday ? $moment(viewData.birthday).format('YYYY-MM-DD') : null }} - {{ viewData.nation }} - {{ viewData.nativePlace }} - {{ viewData.nationality }} - {{ viewData.idCardType }} - {{ viewData.idCard }} - {{ viewData.political }} - {{ viewData.joinPartyDate ? $moment(viewData.joinPartyDate).format('YYYY-MM-DD') : null }} - {{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format('YYYY-MM-DD') : null}} - {{ viewData.identityType }} - {{ viewData.preparedBy }} - {{ viewData.personType }} - {{ viewData.userState }} - {{ viewData.retireDate ? - $moment(viewData.retireDate).format('YYYY-MM-DD') : null }} - - {{ viewData.mobile }} - {{ viewData.email }} + + {{ viewData.nation }} + {{ viewData.birthday ? $moment(viewData.birthday).format('YYYY-MM-DD') : null }} + {{ viewData.political }} + + {{ viewData.education }} + {{ viewData.academicDegree }} + {{ viewData.position }} + + {{ viewData.unitName }} + {{ viewData.unionName }} + {{ viewData.campus }} + + {{ viewData.idcard }} + {{ viewData.mobile }} + {{ viewData.email }} + + {{ viewData.userState }} + {{ viewData.personType }} + {{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format('YYYY-MM-DD') : null}} + + + + {{ viewData.member ? '会员' : '非会员' }} + {{ viewData.welfareMember ? '福利会员' : '非福利会员' }} + + + + + + + + + + + + + + + + + + +
+ 无数据 + -
会员信息
- - - 是 - 否 - - {{ viewData.unitName }} - {{ viewData.unionName }} - - -
学历信息
- - {{ viewData.education }} - {{ viewData.academicDegree }} - - - -
职称信息
- - {{ viewData.technicalTitle }} - {{ viewData.technicalTitleLevel }} - - - -
职务信息
- - {{ viewData.position }} - {{ viewData.positionLevel }} - {{ viewData.employeeLevel }} - - - `, data() { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/record/memberRecord.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/record/memberRecord.js deleted file mode 100644 index 35f44986..00000000 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/record/memberRecord.js +++ /dev/null @@ -1,143 +0,0 @@ -const MEMBER_RECORD = { - template: ` -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- `, - mixins: [initTableMixins], - data() { - return { - userId: "", - recordId: "", - tableColumns: [ - { prop: "loginname", label: "工号" }, - { prop: "username", label: "姓名" }, - { prop: "sex", label: "性别", sortable: true, width: "100px" }, - { prop: "birthday", label: "出生年月", sortable: true }, - { prop: "personType", label: "人员类型", sortable: true }, - { prop: "userState", label: "在职状态", sortable: true }, - { prop: "unionName", label: "所属工会", sortable: true }, - { prop: "unitName", label: "所属单位", sortable: true }, - { prop: "remark", label: "变更说明", sortable: true } - ], - unions: [], - units: [], - changeTypeData: [], - changeInfoVisible: false, - changeTime: "" - } - }, - methods: { - openUserChangeInfo(row) { - this.$emit("open-change-info", row) - }, - getChangeTypes(changeTypes) { - if (changeTypes) { - const c = JSON.parse(changeTypes) - if (!c || c.length === 0 || !this.changeTypeData || this.changeTypeData.length === 0) return null - return c - .map((v) => { - return this.changeTypeData.find((item) => item.code === v).name - }) - .join(",") - } - return null - }, - openView(userId) { - this.$emit("open-view", userId) - }, - async initData() { - if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { - this.unions = await this.$businessTool.listUnion(this.pageForm.unionId) - this.units = await this.$businessTool.listUnit() - } else { - this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id) - this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) - } - this.pageData() - }, - async flushUnits() { - this.$set(this.pageForm, "unitId", null) - this.units = [] - if (this.pageForm.unionId) { - this.$businessTool.listUnit(this.pageForm.unionId).then((data) => { - this.units = data - }) - } - } - }, - created() { - this.pageData() - this.$businessTool.getAllDictOptions("MEMBER_CHANGE_TYPE").then((res) => { - this.changeTypeData = res - }) - } -} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/chartSummary/index.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/chartSummary/index.html new file mode 100644 index 00000000..c2de1e4f --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/chartSummary/index.html @@ -0,0 +1,376 @@ + + + + +
+ +
+ +
+ +
+ + - + +
+ +
总缴费金额
+
{{numData.payMoney?numData.payMoney:'0'}}
+
+ + +
退款金额
+
{{numData.refundMoney?numData.refundMoney:'0'}}
+
+ + +
退款订单数
+
{{numData.refundSize?numData.refundSize:'0'}}
+
+ + +
总缴费人数
+
{{numData.paySize?numData.paySize:'0'}}
+ + +
+ +
+ + - + +
+ +
已缴人数
+
+ + +
已缴金额
+
+ + + + + +
+ +
+
+ + + +
+ +
+
+
+ + + +
+ + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/config.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/config.html new file mode 100644 index 00000000..4c9d74eb --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/config.html @@ -0,0 +1,370 @@ + + +
+ + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/index.html new file mode 100644 index 00000000..93f8b9a8 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/index.html @@ -0,0 +1,368 @@ + + +
+ + + + + + + + + + + + + + + +
+ +
{{formData.paymentStartMonth}}至{{formData.paymentEndMonth}}
+ + +
+ ( + + ) * 0.5% * {{formData.paymentMonth}}个月 +
+
固定金额缴费
+ + +
+ +
+ + + +
+
+ +
¥ {{formData.paymentMoney}}
+ +
+ +
+ + {{formData.transactionId}} + + +
¥ {{formData.paymentMoney}}
+ +
+ + +
+ +
+ + 请打开手机微信，扫一扫完成支付 +
+
+ + +
+ +
+ + +
+
+
+
+
+
+
+ +
+
+ 支付成功! +
+
+
+ + {{formData.transactionId}} + + +
¥ {{formData.paymentMoney}} +
+ +
+
+ +
+ + 关 闭 + 下一步 + +
+ + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/minePayInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/minePayInfo.js new file mode 100644 index 00000000..29b804f7 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/mine/minePayInfo.js @@ -0,0 +1,125 @@ +const MINE_PAY_INFO = { + template: /*language=html*/ ` +
+ + {{ viewData.loginname }} + {{ viewData.username }} + {{ viewData.projectName }} + {{ viewData.unionname }} + {{ viewData.unitname }} + {{ viewData.personType }} + + 已缴费 + 未缴费 + + {{ viewData.paymentMoney }} + {{ viewData.paymentMonth }} + + + + + + + + {{ refundData.outRefundTradeNo }} + {{ refundData.refundNo }} + + {{ refundData.total ? (Number(refundData.total) / 100) : 0 }} + + {{ moment(refundData.updatedAt).format("YYYY-MM-DD HH:mm:ss") }} + + {{ getRefundStates(refundData.refundState) }} + + + + 关 闭 + + +
+ `, + props: { + tradingStates: { type: Array, default: () => [] }, + refundStates: { type: Array, default: () => [] }, + tradingChannels: { type: Array, default: () => [] }, + }, + data() { + return{ + viewData: {}, + refundData: {}, + refundDialogVisible: false + } + }, + methods: { + showRefundInfo(row) { + this.refundData = {} + this.refundData = this.viewData.refundRecordList.find(item => item.paymentTransactionId === row.id) + if (this.refundData) { + this.refundDialogVisible = true + } else { + this.$message.error("此订单无退款记录") + } + }, + async onOpen(id) { + const resp = await $.post('/platform/member/payment/mine/getPaymentInfoById', {id}) + if (resp.code === 0) { + this.viewData = resp.data + } else { + this.$message.error("操作失败") + } + }, + getTradingStates(data) { + if (!data) { + return + } + return this.tradingStates.find(item => item.name === data).tradingStateName + }, + getRefundStates(data) { + if (!data) { + return + } + debugger + return this.refundStates.find(item => item.name === data).refundStateName + }, + getTradingChannel(data) { + if (!data) { + return + } + return this.tradingChannels.find(item => item.name === data).tradingChannelName + }, + } +} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/project.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/project.html new file mode 100644 index 00000000..4fa59f8c --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/project.html @@ -0,0 +1,410 @@ + + + + +
+ + + + + + + + + + 二维码 + + +
+ + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/refund/index.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/refund/index.html new file mode 100644 index 00000000..a2cbbcc0 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/refund/index.html @@ -0,0 +1,185 @@ + +
+ + + +
+ + + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/summary.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/summary.html new file mode 100644 index 00000000..f02e8af8 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/summary.html @@ -0,0 +1,483 @@ + + +
+ + + + + + + + + + + + + + + + +
+ + 取 消 + 确 定 + +
+ +
+ + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/membercost/user.html b/src/main/resources/views/platform/zhgh/staffmanage/membercost/user.html new file mode 100644 index 00000000..b16a718d --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffmanage/membercost/user.html @@ -0,0 +1,337 @@ + +
+ + + + + + + + +
+ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/addOrModifySpecialStaff.js b/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/addOrModifySpecialStaff.js index a06d12c0..6520d84c 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/addOrModifySpecialStaff.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/addOrModifySpecialStaff.js @@ -1,86 +1,155 @@ const ADD_OR_MODIFY_SPECIAL_STAFF = { - template: ` + template: /*language=HTML*/ `
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 提交 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 关闭 + 提交 + +
`, store, @@ -89,13 +158,15 @@ const ADD_OR_MODIFY_SPECIAL_STAFF = { }, data() { return { + isThreeUnit: false, formData: {}, units: [], specialStaffTypeList: [], users: [], formRules: { userId: [{ required: true, message: "请输入工号", trigger: "change" }], - specialStaffType: [{ required: true, message: "请选择多单位人员类型", trigger: "change" }], + specialStaffType: [{ required: true, message: "请选择人员类型", trigger: "change" }], + unionRelationUnionId: [{ required: true, message: "请选择工会关系所属工会", trigger: "change" }], specialStaffRemark: [{ required: true, message: "请填写多单位人员备注", trigger: "change" }] } } diff --git a/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/index.html b/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/index.html index f6711ae0..95be731d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/specialstaff/manage/index.html @@ -52,9 +52,17 @@ layout("/layouts/platform.html"){ :sortable="column.sortable" header-align="center" show-overflow-tooltip> - + + + @@ -82,104 +90,362 @@ layout("/layouts/platform.html"){ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 关闭 + 提交 + + + + + + +
+ + + + + + + + + +
+
+
+
+ +
+
+
+ 项目名称： + {{item.projectName}} +
+
+ 所属时间： + {{item.paymentStartMonth}} 至 {{item.paymentEndMonth}} +
+
+ 缴费时间： + {{moment(item.startTime).format('MM-DD') + ' 至 ' + moment(item.endTime).format('MM-DD')}} +
+
+
+
+ + 我要缴费 + + +
+
+ +
+ + +
+ + + + + + + + + + + + + +
+ + + + + + + +
+ + + + diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/memberCost/paySuccess.html b/src/main/resources/views/platform/zhghh5/staffmanage/memberCost/paySuccess.html new file mode 100644 index 00000000..603cafd6 --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffmanage/memberCost/paySuccess.html @@ -0,0 +1,134 @@ + + + +
+ +
+
+ + 支付成功 + 您已付款成功，请返回查看会费情况 +
+
+
+
￥{{total_amount}}
+
+ +
+
+ + 订单编号 + + {{out_trade_no}} + + + + 支付时间 + + {{timestamp}} + + +
+
+ + +
+ + + + + + diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/memberCost/summary.html b/src/main/resources/views/platform/zhghh5/staffmanage/memberCost/summary.html new file mode 100644 index 00000000..c6fe050c --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffmanage/memberCost/summary.html @@ -0,0 +1,198 @@ + +
+ + + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ 提交 +
+ +
+ +
+
+ + +