commit

src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java

@@ -137,7 +137,6 @@ public class ActivityDeclareMineController {
         } else {
             cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy()));
         }
-        cnd.groupBy("t.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = activityDeclareService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql);
         return Result.success().addData(pagination);
@@ -178,7 +177,7 @@ public class ActivityDeclareMineController {
     @Ok("void")
     @SaCheckPermission("activityDeclare.mine")
     @SLog(tag = "活动申报", msg = "导出活动申报表")
-    public void doExport(@Valid String id, HttpServletResponse response) {
+    public void doExportDeclare(@Valid String id, HttpServletResponse response) {
         HashMap<String, Object> docData = new HashMap<>();
 
         Sql sql = Sqls.create("""

src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementApplyController.java

@@ -37,6 +37,7 @@ import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -87,9 +88,6 @@ public class ActivityReimbursementApplyController {
                 .mapToDouble(v -> ObjectUtil.defaultIfNull(v.getActualPrice(), 0D))
                 .sum();
         activityReimbursementInfo.setActualMoney(new BigDecimal(sum));
-        if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) {
-            activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getId());
-        }
         dao.insertOrUpdate(activityReimbursementInfo);
         return Result.success();
     }
@@ -110,9 +108,6 @@ public class ActivityReimbursementApplyController {
                 .mapToDouble(v -> ObjectUtil.defaultIfNull(v.getActualPrice(), 0D))
                 .sum();
         activityReimbursementInfo.setActualMoney(new BigDecimal(sum));
-        if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) {
-            activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getId());
-        }
         dao.insertOrUpdate(activityReimbursementInfo);
 
         // 开启流程实例
@@ -146,9 +141,6 @@ public class ActivityReimbursementApplyController {
                 .mapToDouble(v -> ObjectUtil.defaultIfNull(v.getActualPrice(), 0D))
                 .sum();
         activityReimbursementInfo.setActualMoney(new BigDecimal(sum));
-        if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) {
-            activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getId());
-        }
         dao.insertOrUpdate(activityReimbursementInfo);
 
         Dict dict = Dict.create();
@@ -162,14 +154,33 @@ public class ActivityReimbursementApplyController {
     @At
     @ApiOperation("获取当前用户活动报销")
     @SaCheckPermission("activityReimbursement.apply")
-    public Result getActivityReimbursementByUser() {
-        // 查询reimbursement表里面没有，在declare表里面有的申请记录
-        Sql sql = Sqls.create("SELECT declareId FROM activity_reimbursement_info WHERE userId = @userId").setParam("userId", SecurityUtil.getUserId());
+    public Result getActivityReimbursementByUser(String id) {
+        if (StrUtil.isNotBlank(id)) {
+            ActivityReimbursementInfo reimbursementInfo = dao.fetch(ActivityReimbursementInfo.class, id);
+            ActivityDeclareInfo info = dao.fetch(ActivityDeclareInfo.class, reimbursementInfo.getDeclareId());
+            return Result.success().addData(List.of(info));
+        }
+
+        // 查询已经报销成功的记录
+        Sql reiSql = Sqls.create("""
+                SELECT
+                    info.declareId
+                FROM
+                    activity_reimbursement_info info
+                    LEFT JOIN wf_process_instance ins ON ins.businessNo = info.id
+                WHERE
+                    userId = @userId
+                    AND ins.state IN (10, 20)
+                """).setParam("userId", SecurityUtil.getUserId());
+        reiSql.setCallback(Sqls.callback.strList());
+        dao.execute(reiSql);
+        List<String> reiDecIdList = reiSql.getList(String.class);
+
+        Sql sql = Sqls.create("select declareId from activity_reimbursement_info where userId = @userId").setParam("userId", SecurityUtil.getUserId());
         sql.setCallback(Sqls.callback.strList());
         dao.execute(sql);
         List<String> declareIdList = sql.getList(String.class);
 
-
         Sql applySql = Sqls.create("""
                 SELECT
                   info.*
@@ -178,10 +189,12 @@ public class ActivityReimbursementApplyController {
                   LEFT JOIN wf_process_instance ins ON info.id = ins.businessNo
                 $condition
                 """);
-
         Cnd cnd = Cnd.NEW();
         if (Lang.isNotEmpty(declareIdList)) {
-            cnd.and("info.id", "in", declareIdList);
+            cnd.and("info.id", "not in", declareIdList);
+        }
+        if (Lang.isNotEmpty(reiDecIdList)) {
+            cnd.and("info.id", "not in", reiDecIdList);
         }
         cnd.and("info.userId", "=", SecurityUtil.getUserId());
         cnd.and("ins.state", "=", 20);

src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/models/ActivityReimbursementInfo.java

@@ -5,6 +5,7 @@ import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityD
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -22,6 +23,12 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class ActivityReimbursementInfo extends ActivityDeclareInfo {
 
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
     @Column
     @Comment("申报id")
     @ColDefine(type = ColType.VARCHAR, width = 32)