增加用户事项今日数累计数统计

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/UserMatterApplyService.java

@@ -11,4 +11,6 @@ import com.mortals.xhx.module.matter.model.UserMatterApplyEntity;
 */
 public interface UserMatterApplyService extends ICRUDService<UserMatterApplyEntity,Long>{
 
+    int getAllCount();
+    int getTodayCount();
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/UserMatterApplyServiceImpl.java

 package com.mortals.xhx.module.matter.service.impl;
 import cn.hutool.core.util.RandomUtil;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.DateUtils;
 import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.matter.model.*;
 import com.mortals.xhx.module.matter.service.*;
@@ -145,4 +146,17 @@ public class UserMatterApplyServiceImpl extends AbstractCRUDServiceImpl<UserMatt
         return fullName;
     }
 
+    @Override
+    public int getAllCount() {
+        return dao.getCount(new UserMatterApplyQuery());
+    }
+
+    @Override
+    public int getTodayCount() {
+        String dateStr = DateUtils.getDateTimeStr(new Date(),"yyyy-MM-dd");
+        UserMatterApplyQuery query = new UserMatterApplyQuery();
+        query.setCreateTimeStart(dateStr);
+        query.setCreateTimeEnd(dateStr);
+        return dao.getCount(query);
+    }
 }
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/UserMatterDetailsServiceImpl.java

@@ -11,6 +11,7 @@ import com.mortals.xhx.module.matter.dao.UserMatterDetailsDao;
 import com.mortals.xhx.module.matter.model.UserMatterDetailsEntity;
 import com.mortals.xhx.module.matter.service.UserMatterDetailsService;
 
+import java.io.File;
 import java.util.Date;
 
 /**
@@ -45,6 +46,10 @@ public class UserMatterDetailsServiceImpl extends AbstractCRUDServiceImpl<UserMa
         String imagePath = "/file/uploadfile/"+imageName;
 
         String filePath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/" + imagePath;
+        File pathDir = new File(this.filePath.endsWith("/") ? this.filePath : this.filePath + "/file/uploadfile");
+        if (!pathDir.exists()) {
+            pathDir.mkdirs();
+        }
         try{
             ImageBase64.convertImg(base64.trim(),filePath);
             entity.setPreviewUrl(imagePath);

sst-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterApplyController.java

@@ -8,6 +8,7 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.matter.model.DatumLibraryEntity;
 import com.mortals.xhx.module.matter.model.vo.MatterApplyGroupVo;
+import com.mortals.xhx.module.matter.service.UserMatterApplyService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -43,6 +44,8 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserMatterApplyService userMatterApplyService;
 
     public MatterApplyController(){
         super.setModuleDesc( "申报事项");
@@ -128,6 +131,8 @@ public class MatterApplyController extends BaseCRUDJsonBodyMappingController<Mat
             }
             model.put("data", result.getList());
             model.put("pageInfo", result.getPageInfo());
+            model.put("allCount",userMatterApplyService.getAllCount());
+            model.put("todayCount",userMatterApplyService.getTodayCount());
             this.parsePageInfo(model, result.getPageInfo());
             code = 1;
             model.put("message_info", busiDesc + "成功");

sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstBasicController.java

@@ -12,10 +12,14 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.ParamKey;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.app.AppPdu;
+import com.mortals.xhx.feign.app.IAppFeign;
 import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
 import com.mortals.xhx.feign.base.pdu.SitePdu;
 import com.mortals.xhx.feign.rsp.ApiResp;
 import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.module.apps.model.AppsInfoEntity;
 import com.mortals.xhx.module.sst.model.SstAppsEntity;
 import com.mortals.xhx.module.sst.service.SstAppsDeskService;
 import com.mortals.xhx.module.sst.service.SstAppsService;
@@ -64,6 +68,8 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
 
     @Autowired
     private ISiteFeign iSiteFeign;
+    @Autowired
+    private IAppFeign appFeign;
 
     public SstBasicController(){
         super.setModuleDesc( "基础配置");
@@ -244,6 +250,13 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
             model.put("showApps", sstApps.get("showApps"));
             model.put("hotApps", sstApps.get("hotApps"));
             model.put("allApps", sstApps.get("allApps"));
+            AppPdu appPdu = new AppPdu();
+            appPdu.setSiteId(query.getSiteId());
+            appPdu.setSize(999);
+            Rest<RespData<List<AppPdu>>> rest = appFeign.list(appPdu);
+            if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
+                model.put("dict",rest.getData().getDict());
+            }
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {