Browse Source

修改

master
wangpengfei 2 years ago
parent
commit
4e97eab313
  1. 1
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml
  2. 20
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

1
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.xml

@ -6,5 +6,6 @@
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
order by orderDate desc
</select> </select>
</mapper> </mapper>

20
yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@ -94,10 +94,12 @@ public class ProjectDailyRest {
getOne(new QueryWrapper<MessagePushLog>(). getOne(new QueryWrapper<MessagePushLog>().
eq("projectSid",ProjectDailys.getProjectSid()). eq("projectSid",ProjectDailys.getProjectSid()).
eq("orderDate",ProjectDailys.getOrderDate())); eq("orderDate",ProjectDailys.getOrderDate()));
MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",sysUser.getAppletOpenid()).eq("messageSid",m.getSid())); if(null!=m){
if(null!=messageOpenid){ MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",sysUser.getAppletOpenid()).eq("messageSid",m.getSid()));
messageOpenid.setState("1"); if(null!=messageOpenid){
messageOpenidService.updateById(messageOpenid); messageOpenid.setState("1");
messageOpenidService.updateById(messageOpenid);
}
} }
}else if(StringUtils.isNotNull(ProjectDailys.getWxCode())&!ProjectDailys.getWxCode().equals("")){ }else if(StringUtils.isNotNull(ProjectDailys.getWxCode())&!ProjectDailys.getWxCode().equals("")){
ResultBean<JSONObject> rbJsonObject = wxLogin(ProjectDailys.getWxCode(), APP_ID,SECRET); ResultBean<JSONObject> rbJsonObject = wxLogin(ProjectDailys.getWxCode(), APP_ID,SECRET);
@ -113,10 +115,12 @@ public class ProjectDailyRest {
} }
MessagePushLog m=messagePushLogService.getOne(new QueryWrapper<MessagePushLog>() MessagePushLog m=messagePushLogService.getOne(new QueryWrapper<MessagePushLog>()
.eq("projectSid",ProjectDailys.getProjectSid()).eq("orderDate",ProjectDailys.getOrderDate())); .eq("projectSid",ProjectDailys.getProjectSid()).eq("orderDate",ProjectDailys.getOrderDate()));
MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",openid).eq("messageSid",m.getSid())); if(null!=m){
if(null!=messageOpenid){ MessageOpenid messageOpenid=messageOpenidService.getOne(new QueryWrapper<MessageOpenid>().eq("openId",openid).eq("messageSid",m.getSid()));
messageOpenid.setState("1"); if(null!=messageOpenid){
messageOpenidService.updateById(messageOpenid); messageOpenid.setState("1");
messageOpenidService.updateById(messageOpenid);
}
} }
}else if ((StringUtils.isNull(ProjectDailys.getWxCode())|ProjectDailys.getWxCode().equals("")) && (StringUtils.isNull(ProjectDailys.getUserSid())|ProjectDailys.getUserSid().equals(""))){ }else if ((StringUtils.isNull(ProjectDailys.getWxCode())|ProjectDailys.getWxCode().equals("")) && (StringUtils.isNull(ProjectDailys.getUserSid())|ProjectDailys.getUserSid().equals(""))){
return rb.setMsg("无权限").setCode("410"); return rb.setMsg("无权限").setCode("410");

Loading…
Cancel
Save