活动

src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyUserController.java

@@ -94,7 +94,7 @@ public class ActivityUnionApplyUserController {
         cnd.andEx("tissue.type", "=", type);
         cnd.andEx("tissue.state", "=", 3);
         cnd.andEx("tissue.projectTypeCode", "!=", 50004);
-        cnd.andEx("tissue.signUpMethod", "in", List.of(1, 2));
+        cnd.andEx("tissue.signUpMethod", "in", List.of(1, 2, 3));
 
         if (Strings.isNotBlank(name)) {
             cnd.where().andLike("tissue.name", name);

src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java

@@ -3,6 +3,7 @@ package io.v.nutz.zhgh.activity.controller.union;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.hutool.core.util.StrUtil;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
@@ -36,6 +37,7 @@ 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.Strings;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
@@ -143,6 +145,41 @@ public class ActivityUnionManageController {
         return sysUserService.listPageMap(1, 30, sql);
     }
 
+
+    @At
+    @ViReturn
+    @Aop(TransAop.READ_COMMITTED)
+    @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
+    public Object doSave(@Param(value = "tissue") ActivityTissue tissue){
+        tissue.setUserId(StrUtil.isNotBlank(tissue.getUserId()) ? tissue.getUserId() : ShiroUtil.getUserId());
+        tissue.setApplyTime(StrUtil.isNotBlank(tissue.getApplyTime()) ? tissue.getApplyTime() : DateUtil.getDate());
+        tissue.setState(0);
+
+        if (tissue.getType() == 40002) {
+            tissue.setUnionId(Vi.getUnionId());
+        } else if (tissue.getType() == 40003) {
+            tissue.setClubId(vi.getClubId());
+        }
+        // 如果有商品，则设置商品活动编码和活动id
+        if (Lang.isNotEmpty(tissue.getGoods())) {
+            tissue.getGoods().forEach(v -> {
+                v.setActivityCode(tissue.getActivityCode());
+                v.setReid(tissue.getId());
+            });
+        }
+
+        activityTissueService.insertWith(tissue, "tissuePersonList");
+        activitySchoolService.dao().insert(tissue.getGoods());
+
+        if (tissue.getIsEnrollSystem()) {
+            Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
+            activitySchoolService.dao().insertOrUpdate(sysHomeActivity);
+        }
+
+        return null;
+    }
+
+
     /**
      * 校工会添加
      *
@@ -154,12 +191,14 @@ public class ActivityUnionManageController {
     @Aop(TransAop.READ_COMMITTED)
     @RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
     public Object doAdd(@Param(value = "tissue") ActivityTissue tissue) {
-        tissue.setUserId(ShiroUtil.getUserId());
-        tissue.setApplyTime(DateUtil.getDate());
+        tissue.setUserId(StrUtil.isNotBlank(tissue.getUserId()) ? tissue.getUserId() : ShiroUtil.getUserId());
+        tissue.setApplyTime(StrUtil.isNotBlank(tissue.getApplyTime()) ? tissue.getApplyTime() : DateUtil.getDate());
         if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
             tissue.setState(1);
         } else {
             tissue.setState(3);
+            tissue.setIsDisabled(true);
+            tissue.setIsEnrollSystem(true);
         }
         if (tissue.getType() == 40002) {
             tissue.setUnionId(Vi.getUnionId());
@@ -170,13 +209,14 @@ public class ActivityUnionManageController {
             v.setActivityCode(tissue.getActivityCode());
             v.setReid(tissue.getId());
         });
-        tissue.getCover();
+//        tissue.getCover();
 
         activityTissueService.insertWith(tissue, "tissuePersonList");
         activitySchoolService.dao().insert(tissue.getGoods());
 
         if (tissue.getIsEnrollSystem()) {
             Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity();
+            sysHomeActivity.setEnable(true);
             activitySchoolService.dao().insertOrUpdate(sysHomeActivity);
         }
         return null;

src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java

@@ -20,6 +20,7 @@ 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;
@@ -67,8 +68,12 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
                 	$condition
                 """);
 
-        cnd.andEx("YEAR(tissue.startTime)", "=", year);
-        cnd.andEx("tissue.projectTypeCode", "!=", "50004");
+        cnd.andEx("YEAR(tissue.applyTime)", "=", year);
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        seg.or("tissue.projectTypeCode", "!=", "50004");
+        seg.or("tissue.projectTypeCode", "is", null);
+        cnd.and(seg);
+//        cnd.andEx("tissue.projectTypeCode", "!=", "50004");
         cnd.andEx("tissue.unionId", "=", unionId);
         cnd.andEx("tissue.type", "=", type);