代码提交

liusheng

2024-08-16 4274addd786ff7b0e6faffb59e90029911b90232

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -78,7 +78,7 @@
    private IServiceReimbursementService serviceReimbursementService;

    @Autowired
    private IServiceSystemmessageService ServiceSystemmessage;
    private IServiceSystemmessageService iServiceSystemmessageService;

    @Autowired
    private IServiceExternalpersonService externalpersonService;
@@ -470,7 +470,7 @@
                    serviceSystemmessage.setMessagecontent("您" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "提交的绩效申请已驳回，原因: " + checkFundVO.getFlowcontent() + "");
                }
            }
            ServiceSystemmessage.save(serviceSystemmessage);
            iServiceSystemmessageService.save(serviceSystemmessage);
            return AjaxResult.success();
        } else {
            return AjaxResult.error(HttpStatus.NO_CONTENT, "费用编号不正确");

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -17,6 +17,9 @@

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
@@ -52,6 +55,9 @@

    @Autowired
    private ISysUserService sysUserService;

    @Autowired
    private IServiceSystemmessageService iServiceSystemmessageService;


    @Autowired
@@ -96,6 +102,20 @@

                SysUser sysUser = sysUserService.selectUserByUserName(serviceFund1.getUserno());
                sendMeg(split, sysUser.getPhonenumber(), serviceFundShared.getApplytype(), 2, serviceFundShared.getSerfunid());
                //发送信息保存
                ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
                serviceSystemmessage.setFundtype(1);
                serviceSystemmessage.setSenduserno(sysUser.getUserName());
                serviceSystemmessage.setSendusername(sysUser.getNickName());
                serviceSystemmessage.setReceiveuserno(serviceFund.getUserno());
                serviceSystemmessage.setReceiveusername(serviceFund.getUsername());
                serviceSystemmessage.setUpdateTime(new Date());
                serviceSystemmessage.setUpdateBy(sysUser.getNickName());
                serviceSystemmessage.setIsread(0);
                serviceSystemmessage.setMessagetype(1);
                serviceSystemmessage.setMessagetitle("财务系统驳回信息");
                serviceSystemmessage.setMessagecontent(serviceFundShared.getCxrjyj());
                iServiceSystemmessageService.save(serviceSystemmessage);
            } else {
                //不是退回的操作
                if (StringUtils.isNotBlank(serviceFundShared.getZffs()) && serviceFundShared.getSpjg() == 0) {
@@ -324,7 +344,21 @@
                serviceReimbursementService.updateById(serviceReimbursement1);

                SysUser sysUser = sysUserService.selectUserByUserName(serviceReimbursement1.getUserno());
                //发送信息保存
                sendMeg(split, sysUser.getPhonenumber(), "0", 1, serviceReimbursementShared.getReimid());
                ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
                serviceSystemmessage.setFundtype(1);
                serviceSystemmessage.setSenduserno(sysUser.getUserName());
                serviceSystemmessage.setSendusername(sysUser.getNickName());
                serviceSystemmessage.setReceiveuserno(serviceReimbursement1.getUserno());
                serviceSystemmessage.setReceiveusername(serviceReimbursement1.getUsername());
                serviceSystemmessage.setUpdateTime(new Date());
                serviceSystemmessage.setUpdateBy(sysUser.getNickName());
                serviceSystemmessage.setIsread(0);
                serviceSystemmessage.setMessagetype(1);
                serviceSystemmessage.setMessagetitle("财务系统驳回信息");
                serviceSystemmessage.setMessagecontent(serviceReimbursementShared.getCxrjyj());
                iServiceSystemmessageService.save(serviceSystemmessage);
            } else {
                //不是退回的操作

@@ -520,7 +554,6 @@

                            serviceFundflow.setCheckTime(parse);
                            fundflowService.save(serviceFundflow);

                        }
                        //如果已经更新则不在处理
                    }
@@ -564,16 +597,33 @@
        ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
        ConcurrentHashMap map = new ConcurrentHashMap();
        map.put("审批人：", people);
        map.put("审批时间：", time);
        try {
            boolean validDateTime = isValidDateTime(time);
            if (validDateTime) map.put("审批时间：" , new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(time));
            else map.put("审批时间：" , new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(time + ":00"));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        map.put("意见：", content);
        contentList.add(map);
        DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
        dingTalkReqVo.setTitle("财务系统驳回信息");
        dingTalkReqVo.setNumber(phone);
        dingTalkReqVo.setContents(contentList);
        log.info("钉钉发送消息:{}" , dingTalkReqVo);
        dingTalkService.sendNotification(dingTalkReqVo);
    }

    public boolean isValidDateTime(String dateTime) {
        try {
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            LocalDateTime.parse(dateTime, formatter);
            return true;
        } catch (DateTimeParseException e) {
            return false;
        }
    }

    private ReentrantLock lock = new ReentrantLock();

    public String myMethod() {