添加材料数量统计

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

 package com.mortals.xhx.module.matter.web;
+
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.YesNo;
@@ -18,8 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.service.MatterService;
@@ -27,33 +30,35 @@ import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 事项申请材料
-*
-* @author zxfei
-* @date 2022-09-27
-*/
+ * 事项申请材料
+ *
+ * @author zxfei
+ * @date 2022-09-27
+ */
 @RestController
 @RequestMapping("matter")
-public class MatterController extends BaseCRUDJsonBodyMappingController<MatterService,MatterEntity,Long> {
+public class MatterController extends BaseCRUDJsonBodyMappingController<MatterService, MatterEntity, Long> {
 
     @Autowired
     private ParamService paramService;
     @Autowired
     private MatterDatumService matterDatumService;
 
-    public MatterController(){
-        super.setModuleDesc( "事项");
+    public MatterController() {
+        super.setModuleDesc("事项");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "isRecommend", paramService.getParamBySecondOrganize("Matter","isRecommend"));
+        this.addDict(model, "isRecommend", paramService.getParamBySecondOrganize("Matter", "isRecommend"));
         this.addDict(model, "source", IBaseEnum.getEnumMap(MatterSourceEnum.class));
         super.init(model, context);
     }
@@ -64,7 +69,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
             query.setMatterName("%".concat(query.getMatterName()).concat("%"));
         }
         List<OrderCol> orderColList = new ArrayList<>();
-        orderColList.add(new OrderCol("isRecommend",OrderCol.DESCENDING));
+        orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING));
         query.setOrderColList(orderColList);
         super.doListBefore(query, model, context);
     }
@@ -72,20 +77,22 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     @Override
     protected int doListAfter(MatterEntity query, Map<String, Object> model, Context context) throws AppException {
         //统计材料数量
+        int count = 0;
         List<Long> matterIdList = this.service.find(query, context).stream().map(MatterEntity::getId).collect(Collectors.toList());
         MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
-        if(!ObjectUtils.isEmpty(matterIdList)){
+        if (!ObjectUtils.isEmpty(matterIdList)) {
             matterDatumQuery.setMatterIdList(matterIdList);
+        } else {
+            count = matterDatumService.count(matterDatumQuery.siteId(query.getSiteId()), getContext());
         }
-        int count = matterDatumService.count(matterDatumQuery.siteId(query.getSiteId()), getContext());
         model.put("matterDatumTotal", count);
 //        int recommendCount = paramService.getParamIntValue(ParamKey.MATTER_RECOMMEND_COUNT);
 //        model.put("matterDatumTotal", count);
         return super.doListAfter(query, model, context);
     }
 
-    @RequestMapping(value = {"createMatter"},method = {RequestMethod.POST, RequestMethod.GET})
-    public String createMatter(Long[] ids,Long siteId) {
+    @RequestMapping(value = {"createMatter"}, method = {RequestMethod.POST, RequestMethod.GET})
+    public String createMatter(Long[] ids, Long siteId) {
         Map<String, Object> model = new HashMap();
         int code = 1;
         String busiDesc = "站点事项转事项";
@@ -107,7 +114,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     }
 
 
-    @RequestMapping(value = {"recommend"},method = {RequestMethod.POST, RequestMethod.GET})
+    @RequestMapping(value = {"recommend"}, method = {RequestMethod.POST, RequestMethod.GET})
     public String recommend(Long id) {
         Map<String, Object> model = new HashMap();
         int code = VALUE_RESULT_SUCCESS;