diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java index db20e355..caf4ef49 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java @@ -59,6 +59,10 @@ public class RiskMessagesLogVo implements Vo { //{thing3=瀚川商贸仓库, thing4=图片对比异常, time5=2023-11-06 05:04:08} vo.setTime(map.get("time5")); vo.setShName(map.get("thing3")); + }else if(type.equals("每日数据上报")){ + //{time1=2023-08-15 09:57, thing3=赵丽晓, thing2=监管数据总览(喜相随生产加工动产质押项…} + vo.setTime(map.get("time1")); + vo.setShName(map.get("thing2")); } } this.templateMessageVo=vo; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java index 7fade966..1da98a29 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java @@ -350,10 +350,13 @@ public class ProjectDailyService extends ServiceImpl> getProjectDailys(ProjectDailyQuery query) { ResultBean rb=new ResultBean().fail(); ProjectDailyQuery params = query; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); QueryWrapper qw = new QueryWrapper<>(); if (params != null) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { qw.eq("orderDate", params.getOrderDate()); + }else{ + qw.eq("orderDate",sdf.format(DateUtil.yesterday())); } if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { @@ -367,10 +370,12 @@ public class ProjectDailyService extends ServiceImpl qw = new QueryWrapper<>(); - + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (params != null) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) { qw.eq("orderDate", params.getOrderDate()); + }else{ + qw.eq("orderDate",sdf.format(DateUtil.yesterday())); } if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) { diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java index 64a9fb7a..6e2ff33a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java @@ -11,6 +11,8 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * @author wangpengfei * @date 2023/7/27 9:56 @@ -27,4 +29,6 @@ public interface RiskMessagesLogMapper extends BaseMapper { RiskMessagesLogVo getMessage(); @Select("select count(*) from risk_messages_log i left join risk_message_user m on m.messageSid=i.sid where m.state='0' and m.openId =#{openId}") Integer getMessageCount(@Param("openId") String openId); + + List messageNotice(@Param(Constants.WRAPPER) Wrapper qw); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml index 9409cb9b..d1ec1a26 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml @@ -67,4 +67,47 @@ report_sales_day_store ${ew.sqlSegment} + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java index d60abb79..14fce9d8 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java @@ -41,5 +41,8 @@ public class RiskMessagesLogRest { public ResultBean getMessageBySid(@PathVariable("sid") String sid,@PathVariable("wxCode") String wxCode ){ return RiskMessagesLogService.getMessageBySid(sid,wxCode); } - + @GetMapping("/messageNotice/{userSid}") + public ResultBean messageNotice(@PathVariable("userSid") String userSid){ + return RiskMessagesLogService.messageNotice(userSid); + } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java index fe72cc8f..d762f517 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java @@ -140,4 +140,12 @@ public class RiskMessagesLogService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + public ResultBean messageNotice(String userSid){ + ResultBean rb=new ResultBean(); + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("message.openId",sysUser.getOpenId()); +// qw.orderByDesc("messageTime"); + return rb.success().setData(baseMapper.messageNotice(qw)); + } }